Commit de306cfb authored by Jasper Maes's avatar Jasper Maes
Browse files

Upgrade Rails to 5.1.6.1 

Model.new.attributes now also returns encrypted attributes.
parent 0fcbbdc3

Gemfile

+2 −2
Original line number Diff line number Diff line 
source 'https://rubygems.org'



gem 'rails', '5.0.7.1'

gem 'rails', '5.1.6.1'

gem 'rails-deprecated_sanitizer', '~> 1.0.3'



# Improves copy-on-write performance for MRI
@@ -19,7 +19,7 @@ gem 'mysql2', '~> 0.4.10', group: :mysql 
gem 'pg', '~> 1.1', group: :postgres



gem 'rugged', '~> 0.27'

gem 'grape-path-helpers', '~> 1.0'

gem 'grape-path-helpers', '~> 1.1'



gem 'faraday', '~> 0.12'

Gemfile.lock

+46 −47
Original line number Diff line number Diff line
@@ -4,41 +4,41 @@ GEM 
    RedCloth (4.3.2)

    abstract_type (0.0.7)

    ace-rails-ap (4.1.2)

    actioncable (5.0.7.1)

      actionpack (= 5.0.7.1)

      nio4r (>= 1.2, < 3.0)

    actioncable (5.1.6.1)

      actionpack (= 5.1.6.1)

      nio4r (~> 2.0)

      websocket-driver (~> 0.6.1)

    actionmailer (5.0.7.1)

      actionpack (= 5.0.7.1)

      actionview (= 5.0.7.1)

      activejob (= 5.0.7.1)

    actionmailer (5.1.6.1)

      actionpack (= 5.1.6.1)

      actionview (= 5.1.6.1)

      activejob (= 5.1.6.1)

      mail (~> 2.5, >= 2.5.4)

      rails-dom-testing (~> 2.0)

    actionpack (5.0.7.1)

      actionview (= 5.0.7.1)

      activesupport (= 5.0.7.1)

    actionpack (5.1.6.1)

      actionview (= 5.1.6.1)

      activesupport (= 5.1.6.1)

      rack (~> 2.0)

      rack-test (~> 0.6.3)

      rack-test (>= 0.6.3)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.0, >= 1.0.2)

    actionview (5.0.7.1)

      activesupport (= 5.0.7.1)

    actionview (5.1.6.1)

      activesupport (= 5.1.6.1)

      builder (~> 3.1)

      erubis (~> 2.7.0)

      erubi (~> 1.4)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.0, >= 1.0.3)

    activejob (5.0.7.1)

      activesupport (= 5.0.7.1)

    activejob (5.1.6.1)

      activesupport (= 5.1.6.1)

      globalid (>= 0.3.6)

    activemodel (5.0.7.1)

      activesupport (= 5.0.7.1)

    activerecord (5.0.7.1)

      activemodel (= 5.0.7.1)

      activesupport (= 5.0.7.1)

      arel (~> 7.0)

    activemodel (5.1.6.1)

      activesupport (= 5.1.6.1)

    activerecord (5.1.6.1)

      activemodel (= 5.1.6.1)

      activesupport (= 5.1.6.1)

      arel (~> 8.0)

    activerecord_sane_schema_dumper (1.0)

      rails (>= 5, < 6)

    activesupport (5.0.7.1)

    activesupport (5.1.6.1)

      concurrent-ruby (~> 1.0, >= 1.0.2)

      i18n (>= 0.7, < 2)

      minitest (~> 5.1)
@@ -52,7 +52,7 @@ GEM 
      public_suffix (>= 2.0.2, < 4.0)

    aes_key_wrap (1.0.1)

    akismet (2.0.0)

    arel (7.1.4)

    arel (8.0.0)

    asana (0.8.1)

      faraday (~> 0.9)

      faraday_middleware (~> 0.9)
@@ -205,7 +205,6 @@ GEM 
    encryptor (3.0.0)

    equalizer (0.0.11)

    erubi (1.7.1)

    erubis (2.7.0)

    escape_utils (1.2.1)

    et-orbi (1.1.7)

      tzinfo
@@ -279,8 +278,8 @@ GEM 
    fog-xml (0.1.3)

      fog-core

      nokogiri (>= 1.5.11, < 2.0.0)

    font-awesome-rails (4.7.0.1)

      railties (>= 3.2, < 5.1)

    font-awesome-rails (4.7.0.4)

      railties (>= 3.2, < 6.0)

    foreman (0.84.0)

      thor (~> 0.19.1)

    formatador (0.2.5)
@@ -356,8 +355,8 @@ GEM 
    grape-entity (0.7.1)

      activesupport (>= 4.0)

      multi_json (>= 1.3.2)

    grape-path-helpers (1.0.6)

      activesupport (>= 4, < 5.1)

    grape-path-helpers (1.1.0)

      activesupport

      grape (~> 1.0)

      rake (~> 12)

    grape_logging (1.7.0)
@@ -410,7 +409,7 @@ GEM 
      json (~> 1.8)

      multi_xml (>= 0.5.2)

    httpclient (2.8.3)

    i18n (1.2.0)

    i18n (1.3.0)

      concurrent-ruby (~> 1.0)

    icalendar (2.4.1)

    ice_nine (0.11.2)
@@ -662,19 +661,19 @@ GEM 
      rack

    rack-proxy (0.6.0)

      rack

    rack-test (0.6.3)

      rack (>= 1.0)

    rails (5.0.7.1)

      actioncable (= 5.0.7.1)

      actionmailer (= 5.0.7.1)

      actionpack (= 5.0.7.1)

      actionview (= 5.0.7.1)

      activejob (= 5.0.7.1)

      activemodel (= 5.0.7.1)

      activerecord (= 5.0.7.1)

      activesupport (= 5.0.7.1)

    rack-test (1.1.0)

      rack (>= 1.0, < 3)

    rails (5.1.6.1)

      actioncable (= 5.1.6.1)

      actionmailer (= 5.1.6.1)

      actionpack (= 5.1.6.1)

      actionview (= 5.1.6.1)

      activejob (= 5.1.6.1)

      activemodel (= 5.1.6.1)

      activerecord (= 5.1.6.1)

      activesupport (= 5.1.6.1)

      bundler (>= 1.3.0)

      railties (= 5.0.7.1)

      railties (= 5.1.6.1)

      sprockets-rails (>= 2.0.0)

    rails-controller-testing (1.0.2)

      actionpack (~> 5.x, >= 5.0.1)
@@ -690,9 +689,9 @@ GEM 
    rails-i18n (5.1.1)

      i18n (>= 0.7, < 2)

      railties (>= 5.0, < 6)

    railties (5.0.7.1)

      actionpack (= 5.0.7.1)

      activesupport (= 5.0.7.1)

    railties (5.1.6.1)

      actionpack (= 5.1.6.1)

      activesupport (= 5.1.6.1)

      method_source

      rake (>= 0.8.7)

      thor (>= 0.18.1, < 2.0)
@@ -1065,7 +1064,7 @@ DEPENDENCIES 
  gpgme (~> 2.0.18)

  grape (~> 1.1.0)

  grape-entity (~> 0.7.1)

  grape-path-helpers (~> 1.0)

  grape-path-helpers (~> 1.1)

  grape_logging (~> 1.7)

  graphiql-rails (~> 1.4.10)

  graphql (~> 1.8.0)
@@ -1144,7 +1143,7 @@ DEPENDENCIES 
  rack-cors (~> 1.0.0)

  rack-oauth2 (~> 1.2.1)

  rack-proxy (~> 0.6.0)

  rails (= 5.0.7.1)

  rails (= 5.1.6.1)

  rails-controller-testing

  rails-deprecated_sanitizer (~> 1.0.3)

  rails-i18n (~> 5.1)

app/models/ci/build.rb

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ def persisted_environment 
      run_after_commit { BuildHooksWorker.perform_async(build.id) }

    end



    after_save :update_project_statistics_after_save, if: :artifacts_size_changed?

    after_save :update_project_statistics_after_save, if: :saved_change_to_artifacts_size?

    after_destroy :update_project_statistics_after_destroy, unless: :project_destroyed?



    class << self
@@ -816,7 +816,7 @@ def build_attributes_from_config 
    end



    def update_project_statistics_after_save

      update_project_statistics(read_attribute(:artifacts_size).to_i - artifacts_size_was.to_i)

      update_project_statistics(read_attribute(:artifacts_size).to_i - artifacts_size_before_last_save.to_i)

    end



    def update_project_statistics_after_destroy

app/models/ci/job_artifact.rb

+3 −3
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ class JobArtifact < ActiveRecord::Base 
    validates :file_format, presence: true, unless: :trace?, on: :create

    validate :valid_file_format?, unless: :trace?, on: :create

    before_save :set_size, if: :file_changed?

    after_save :update_project_statistics_after_save, if: :size_changed?

    after_save :update_project_statistics_after_save, if: :saved_change_to_size?

    after_destroy :update_project_statistics_after_destroy, unless: :project_destroyed?



    after_save :update_file_store, if: :file_changed?

    after_save :update_file_store, if: :saved_change_to_file?



    scope :with_files_stored_locally, -> { where(file_store: [nil, ::JobArtifactUploader::Store::LOCAL]) }
@@ -174,7 +174,7 @@ def set_size 
    end



    def update_project_statistics_after_save

      update_project_statistics(size.to_i - size_was.to_i)

      update_project_statistics(size.to_i - size_before_last_save.to_i)

    end



    def update_project_statistics_after_destroy

app/models/clusters/platforms/kubernetes.rb

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ def prevent_modification 
      end



      def update_kubernetes_namespace

        return unless namespace_changed?

        return unless saved_change_to_namespace?



        run_after_commit do

          ClusterConfigureWorker.perform_async(cluster_id)