Merge branch 'rails5-fix-47370' into 'master'

Use same gem versions for rails5 as for rails4 where possible

Closes #47370, #46232, #47367, and #47373

See merge request gitlab-org/gitlab-ce!19498

3 files changed, 128 insertions, 114 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 936cd9e8e47..0ce0312e743 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -452,7 +452,6 @@ GEM
     kgio (2.10.0)
     knapsack (1.16.0)
       rake
-      timecop (>= 0.1.0)
     kubeclient (3.1.0)
       http (~> 2.2.2)
       recursive-open-struct (~> 1.0, >= 1.0.4)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index bee13dd1d53..d9a89de32cb 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     RedCloth (4.3.2)
     abstract_type (0.0.7)
-    ace-rails-ap (4.1.4)
+    ace-rails-ap (4.1.2)
     actioncable (5.0.7)
       actionpack (= 5.0.7)
       nio4r (>= 1.2, < 3.0)
@@ -54,12 +54,12 @@ GEM
     akismet (2.0.0)
     allocations (1.0.5)
     arel (7.1.4)
-    asana (0.6.3)
+    asana (0.6.0)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.0)
-    asciidoctor (1.5.6.1)
+    asciidoctor (1.5.6.2)
     asciidoctor-plantuml (0.0.8)
       asciidoctor (~> 1.5)
     asset_sync (2.4.0)
@@ -71,8 +71,8 @@ GEM
     atomic (1.1.99)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
-    attr_required (1.0.1)
-    awesome_print (1.2.0)
+    attr_required (1.0.0)
+    awesome_print (1.8.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -88,12 +88,12 @@ GEM
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     bindata (2.4.3)
-    binding_of_caller (0.7.3)
+    binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     blankslate (2.1.2.4)
     bootstrap_form (2.7.0)
     brakeman (4.2.1)
-    browser (2.5.3)
+    browser (2.2.0)
     builder (3.2.3)
     bullet (5.5.1)
       activesupport (>= 3.0.0)
@@ -102,32 +102,33 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (9.0.6)
-    capybara (2.18.0)
+    capybara (2.15.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    capybara-screenshot (1.0.18)
+      xpath (~> 2.0)
+    capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
-    carrierwave (1.2.2)
+    carrierwave (1.2.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    charlock_holmes (0.7.5)
+    cause (0.1)
+    charlock_holmes (0.7.6)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
-    chunky_png (1.3.10)
+    chunky_png (1.3.5)
     citrus (3.0.2)
-    coderay (1.1.2)
+    coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    commonmarker (0.17.9)
+    commonmarker (0.17.8)
       ruby-enum (~> 0.5)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -140,11 +141,11 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     creole (0.5.0)
-    css_parser (1.6.0)
+    css_parser (1.5.0)
       addressable
-    daemons (1.2.6)
+    daemons (1.2.3)
     database_cleaner (1.5.3)
-    debug_inspector (0.0.3)
+    debug_inspector (0.0.2)
     debugger-ruby_core_source (1.3.8)
     deckar01-task_list (2.0.0)
       html-pipeline
@@ -154,33 +155,33 @@ GEM
       activerecord (>= 3.2.0, < 5.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    device_detector (1.0.1)
-    devise (4.4.1)
+    device_detector (1.0.0)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (3.0.2)
-      activesupport (< 5.2)
+    devise-two-factor (3.0.0)
+      activesupport
       attr_encrypted (>= 1.3, < 4, != 2)
       devise (~> 4.0)
-      railties (< 5.2)
+      railties
       rotp (~> 2.0)
     diff-lcs (1.3)
     diffy (3.1.0)
     docile (1.1.5)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.3.1)
+    doorkeeper (4.3.2)
       railties (>= 4.2)
-    doorkeeper-openid_connect (1.3.0)
+    doorkeeper-openid_connect (1.4.0)
       doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
-    dropzonejs-rails (0.7.4)
+    dropzonejs-rails (0.7.2)
       rails (> 3.1)
     ed25519 (1.2.4)
-    email_reply_trimmer (0.1.10)
+    email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
@@ -189,11 +190,11 @@ GEM
     equalizer (0.0.11)
     erubis (2.7.0)
     escape_utils (1.1.1)
-    et-orbi (1.0.9)
+    et-orbi (1.0.3)
       tzinfo
-    eventmachine (1.2.5)
-    excon (0.60.0)
-    execjs (2.7.0)
+    eventmachine (1.0.8)
+    excon (0.62.0)
+    execjs (2.6.0)
     expression_parser (0.9.0)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
@@ -209,8 +210,8 @@ GEM
       multi_json
     fast_blank (1.0.0)
     fast_gettext (1.6.0)
-    ffaker (2.8.1)
-    ffi (1.9.23)
+    ffaker (2.4.0)
+    ffi (1.9.18)
     flay (2.10.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
@@ -248,13 +249,13 @@ GEM
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.5.0)
-      fog-core (>= 1.27, < 3.0)
-    fog-openstack (0.1.24)
-      fog-core (~> 1.40)
+    fog-local (0.3.1)
+      fog-core (~> 1.27)
+    fog-openstack (0.1.21)
+      fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
-    fog-rackspace (0.1.5)
+    fog-rackspace (0.1.1)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -262,8 +263,8 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    font-awesome-rails (4.7.0.3)
-      railties (>= 3.2, < 5.2)
+    font-awesome-rails (4.7.0.1)
+      railties (>= 3.2, < 5.1)
     foreman (0.84.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
@@ -274,7 +275,7 @@ GEM
       rugged (~> 0.21)
     gemojione (3.3.0)
       json
-    get_process_mem (0.2.1)
+    get_process_mem (0.2.0)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
@@ -350,9 +351,9 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    gpgme (2.0.16)
-      mini_portile2 (~> 2.3)
-    grape (1.0.2)
+    gpgme (2.0.13)
+      mini_portile2 (~> 2.1)
+    grape (1.0.3)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -368,6 +369,10 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
+    graphiql-rails (1.4.10)
+      railties
+      sprockets-rails
+    graphql (1.8.1)
     grpc (1.11.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
@@ -380,23 +385,23 @@ GEM
       rake (>= 10, < 13)
       rubocop (>= 0.49.0)
       sysexits (~> 1.1)
-    hamlit (2.6.2)
+    hamlit (2.6.1)
       temple (~> 0.7.6)
       thor
       tilt
-    hashdiff (0.3.7)
+    hashdiff (0.3.4)
     hashie (3.5.7)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
     health_check (2.6.0)
       rails (>= 4.0)
-    hipchat (1.5.4)
+    hipchat (1.5.2)
       httparty
       mimemagic
     html-pipeline (2.7.1)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html2text (0.2.1)
+    html2text (0.2.0)
       nokogiri (~> 1.6)
     htmlentities (4.3.4)
     http (2.2.2)
@@ -416,9 +421,11 @@ GEM
       concurrent-ruby (~> 1.0)
     icalendar (2.4.1)
     ice_nine (0.11.2)
-    influxdb (0.5.3)
+    influxdb (0.2.3)
+      cause
+      json
     ipaddress (0.8.3)
-    jira-ruby (1.5.0)
+    jira-ruby (1.4.1)
       activesupport
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
@@ -433,30 +440,30 @@ GEM
     json-schema (2.8.0)
       addressable (>= 2.4)
     jwt (1.5.6)
-    kaminari (1.1.1)
+    kaminari (1.0.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    kgio (2.11.2)
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
+    kgio (2.10.0)
     knapsack (1.16.0)
       rake
-    kubeclient (3.1.1)
+    kubeclient (3.1.0)
       http (~> 2.2.2)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.6.0)
+    letter_opener (1.4.1)
       launchy (~> 2.2)
-    letter_opener_web (1.3.3)
+    letter_opener_web (1.3.0)
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
@@ -475,7 +482,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    lograge (0.9.0)
+    lograge (0.10.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -489,11 +496,11 @@ GEM
     memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.9.0)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
+    mimemagic (0.3.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
@@ -505,7 +512,7 @@ GEM
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
-    net-ldap (0.16.1)
+    net-ldap (0.16.0)
     net-ssh (5.0.1)
     netrc (0.11.0)
     nio4r (2.3.1)
@@ -560,7 +567,7 @@ GEM
     omniauth-oauth2 (1.5.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.2)
-    omniauth-oauth2-generic (0.2.4)
+    omniauth-oauth2-generic (0.2.2)
       omniauth-oauth2 (~> 1.0)
     omniauth-saml (1.10.0)
       omniauth (~> 1.3, >= 1.3.2)
@@ -579,7 +586,7 @@ GEM
     orm_adapter (0.5.0)
     os (0.9.6)
     parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
@@ -615,9 +622,9 @@ GEM
       json (>= 1.6.0)
     posix-spawn (0.3.13)
     powerpack (0.1.1)
-    premailer (1.11.1)
+    premailer (1.10.4)
       addressable
-      css_parser (>= 1.6.0)
+      css_parser (>= 1.4.10)
       htmlentities (>= 4.0.0)
     premailer-rails (1.9.7)
       actionmailer (>= 3, < 6)
@@ -628,14 +635,15 @@ GEM
       unparser
     procto (0.0.3)
     prometheus-client-mmap (0.9.3)
-    pry (0.11.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.4.3)
-      byebug (>= 9.0, < 9.1)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
       pry (~> 0.10)
-    pry-rails (0.3.6)
-      pry (>= 0.10.4)
+    pry-rails (0.3.5)
+      pry (>= 0.9.10)
     public_suffix (3.0.2)
     pyu-ruby-sasl (0.0.3.3)
     rack (2.0.5)
@@ -652,7 +660,7 @@ GEM
       rack (>= 1.1)
     rack-protection (2.0.1)
       rack
-    rack-proxy (0.6.4)
+    rack-proxy (0.6.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -690,16 +698,16 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    raindrops (0.19.0)
+    raindrops (0.18.0)
     rake (12.3.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rblineprof (0.3.7)
+    rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
     rdoc (6.0.4)
     re2 (1.1.1)
-    recaptcha (3.4.0)
+    recaptcha (3.0.0)
       json
     recursive-open-struct (1.1.0)
     redcarpet (3.4.0)
@@ -726,8 +734,7 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    request_store (1.4.0)
-      rack (>= 1.4)
+    request_store (1.3.1)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
@@ -736,11 +743,11 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.1)
-    rinku (2.0.4)
+    rinku (2.0.0)
     rotp (2.1.2)
     rouge (3.1.1)
-    rqrcode (0.10.1)
-      chunky_png (~> 1.0)
+    rqrcode (0.7.0)
+      chunky_png
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
     rspec (3.6.0)
@@ -761,7 +768,7 @@ GEM
       proc_to_ast
       rspec (>= 2.13, < 4)
       unparser
-    rspec-rails (3.6.1)
+    rspec-rails (3.6.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -769,7 +776,7 @@ GEM
       rspec-expectations (~> 3.6.0)
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
-    rspec-retry (0.4.6)
+    rspec-retry (0.4.5)
       rspec-core
     rspec-set (0.1.3)
     rspec-support (3.6.0)
@@ -787,7 +794,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
-    rubocop-rspec (1.22.2)
+    rubocop-rspec (1.22.1)
       rubocop (>= 0.52.1)
     ruby-enum (0.7.2)
       i18n
@@ -797,14 +804,14 @@ GEM
     ruby-progressbar (1.9.0)
     ruby-saml (1.7.2)
       nokogiri (>= 1.5.10)
-    ruby_parser (3.11.0)
-      sexp_processor (~> 4.9)
+    ruby_parser (3.9.0)
+      sexp_processor (~> 4.1)
     rubyntlm (0.6.2)
-    rubypants (0.7.0)
+    rubypants (0.2.0)
     rubyzip (1.2.1)
-    rufus-scheduler (3.4.2)
+    rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
-    rugged (0.27.0)
+    rugged (0.27.1)
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
@@ -813,7 +820,7 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
+    sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -829,7 +836,7 @@ GEM
     seed-fu (2.3.7)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    select2-rails (3.5.10)
+    select2-rails (3.5.9.3)
       thor (~> 0.14)
     selenium-webdriver (3.12.0)
       childprocess (~> 0.5)
@@ -837,17 +844,17 @@ GEM
     sentry-raven (2.7.2)
       faraday (>= 0.7.6, < 1.0)
     settingslogic (2.0.9)
-    sexp_processor (4.10.1)
+    sexp_processor (4.9.0)
     sham_rack (1.3.6)
       rack
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    sidekiq (5.1.1)
+    sidekiq (5.1.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
-    sidekiq-cron (0.6.3)
+    sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
     sidekiq-limit_fetch (3.4.0)
@@ -857,14 +864,15 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simple_po_parser (1.1.3)
+    simple_po_parser (1.1.2)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+    simplecov-html (0.10.0)
     slack-notifier (1.5.1)
-    spring (2.0.2)
+    slop (3.6.0)
+    spring (2.0.1)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -877,7 +885,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     sshkey (1.9.0)
-    stackprof (0.2.11)
+    stackprof (0.2.10)
     state_machines (0.5.0)
     state_machines-activemodel (0.5.1)
       activemodel (>= 4.1, < 6.0)
@@ -886,19 +894,19 @@ GEM
       activerecord (>= 4.1, < 6.0)
       state_machines-activemodel (>= 0.5.0)
     stringex (2.8.4)
-    sys-filesystem (1.1.9)
+    sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
     temple (0.7.7)
     test-prof (0.2.5)
     text (1.3.1)
-    thin (1.7.2)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.6)
     timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
     toml (0.1.2)
@@ -918,7 +926,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.3.2)
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -935,7 +943,7 @@ GEM
       parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
     url_safe_base64 (0.2.2)
-    validates_hostname (1.0.8)
+    validates_hostname (1.0.6)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
     version_sorter (2.1.0)
@@ -951,7 +959,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpack-rails (0.9.11)
+    webpack-rails (0.9.10)
       railties (>= 3.2.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
@@ -962,8 +970,8 @@ GEM
       rinku
     with_env (1.1.0)
     xml-simple (1.1.5)
-    xpath (3.0.0)
-      nokogiri (~> 1.8)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -1056,6 +1064,8 @@ DEPENDENCIES
   grape-entity (~> 0.7.1)
   grape-path-helpers (~> 1.0)
   grape_logging (~> 1.7)
+  graphiql-rails (~> 1.4.10)
+  graphql (~> 1.8.0)
   grpc (~> 1.11.0)
   haml_lint (~> 0.26.0)
   hamlit (~> 2.6.1)
diff --git a/changelogs/unreleased/rails5-fix-47370.yml b/changelogs/unreleased/rails5-fix-47370.yml
new file mode 100644
index 00000000000..90c19593b7d
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-47370.yml
@@ -0,0 +1,5 @@
+---
+title: Use same gem versions for rails5 as for rails4 where possible
+merge_request: 19498
+author: Jasper Maes
+type: fixed