1. 11 Apr, 2018 2 commits
    • blackst0ne's avatar
      [Rails5] Fix admin/application_settings_controller · ac1b5def
      blackst0ne authored
      The `RAILS5=1 rspec spec/controllers/admin/application_settings_controller_spec.rb`
      command throws the error:
      
      Failures:
      
        1) Admin::ApplicationSettingsController PUT #update falls back to defaults when settings are omitted
            Failure/Error: import_sources = params[:application_setting][:import_sources]
      
            NoMethodError:
              undefined method `[]' for nil:NilClass
            # ./app/controllers/admin/application_settings_controller.rb:62:in `application_setting_params'
      
      This commit fixes it.
      ac1b5def
    • Robert Speicher's avatar
      Merge branch 'zj-fix-environments-fixtures' into 'master' · 6b246360
      Robert Speicher authored
      Fix enviroments seeding on certain branch names
      
      Closes #45051
      
      See merge request gitlab-org/gitlab-ce!18263
      6b246360
  2. 10 Apr, 2018 21 commits
  3. 09 Apr, 2018 17 commits