chore(gem-dependencies): pg 1.2.3 (was 0.21.0)

Using bundler flags:  conservative
parent 49087740
FROM ruby:2.6.6
LABEL name=aoz-003-gitlab_ci
LABEL version=0.3.1
LABEL build-date=2020-05-18T19:47:18+02:00
LABEL version=0.3.2
LABEL build-date=2020-05-18T21:39:31+02:00
LABEL vendor=Panter maintainer=vok@panter.ch distribution-scope=private URL=https://git.panter.ch/panter/aoz-003
RUN apt update \
......@@ -30,7 +30,7 @@ RUN apt update \
&& cat /chrome_driver_version.txt \
# install correct bundler version
&& gem uninstall bundler \
&& gem install bundler --version 2.0.2 \
&& gem install bundler --version 2.1.4 \
# Cleanup apt and gem cache files and indexes
&& gem cleanup \
&& rm -rf /var/lib/apt/lists/* \
......
......@@ -34,7 +34,7 @@ gem 'mdb'
gem 'panter-rails-deploy'
gem 'paperclip'
gem 'paranoia'
gem 'pg', '~> 0.21'
gem 'pg'
gem 'puma'
gem 'pundit'
gem 'rails-i18n'
......
......@@ -279,7 +279,7 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (0.21.0)
pg (1.2.3)
policy-assertions (0.2.0)
activesupport (>= 3.0.0)
pundit (>= 1.0.0)
......@@ -509,7 +509,7 @@ DEPENDENCIES
paperclip
paranoia
pdf-reader
pg (~> 0.21)
pg
policy-assertions
pry-byebug
pry-rails
......
......@@ -5,7 +5,7 @@ class LanguageSkill < ApplicationRecord
LANGUAGE_LEVELS = [:native_speaker, :basic, :fluent, :good].freeze
scope :german_first, (-> { order("CASE WHEN language = 'DE' THEN 1 ELSE 2 END") })
scope :german_first, (-> { order(Arel.sql("CASE WHEN language = 'DE' THEN 1 ELSE 2 END")) })
scope :german, (-> { where(language: 'DE') })
scope :native, (-> { where(level: 'native_speaker') })
......@@ -32,7 +32,7 @@ class LanguageSkill < ApplicationRecord
def native_and_human_readable
german_first.map(&:full_language_skills)
end
end
end
def language_name
......@@ -42,5 +42,5 @@ class LanguageSkill < ApplicationRecord
def full_language_skills
level_human = level? ? I18n.t(level, scope: [:language_level]) : ''
[language_name, level_human].reject(&:blank?).join(', ') if language?
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment