Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

c2093486

Commit c2093486 authored 8 years ago by Grzegorz Bizon

Downloads
- Plain Diff

Merge branch 'revert-9cac0317' into 'master'

Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"

See merge request !8690

parents 4b7ec44b baeaa97e

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/models/application_setting.rb 40 additions, 44 deletions

app/models/application_setting.rb
lib/gitlab/current_settings.rb 31 additions, 13 deletions

lib/gitlab/current_settings.rb
lib/gitlab/github_import/project_creator.rb 1 addition, 3 deletions

lib/gitlab/github_import/project_creator.rb
spec/controllers/health_check_controller_spec.rb 0 additions, 6 deletions

spec/controllers/health_check_controller_spec.rb
spec/features/admin/admin_disables_git_access_protocol_spec.rb 0 additions, 3 deletions

...features/admin/admin_disables_git_access_protocol_spec.rb
spec/features/admin/admin_health_check_spec.rb 3 additions, 6 deletions

spec/features/admin/admin_health_check_spec.rb
spec/features/admin/admin_runners_spec.rb 0 additions, 3 deletions

spec/features/admin/admin_runners_spec.rb
spec/features/admin/admin_settings_spec.rb 1 addition, 4 deletions

spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_uses_repository_checks_spec.rb 2 additions, 7 deletions

spec/features/admin/admin_uses_repository_checks_spec.rb
spec/lib/gitlab/current_settings_spec.rb 20 additions, 48 deletions

spec/lib/gitlab/current_settings_spec.rb
spec/requests/api/internal_spec.rb 6 additions, 3 deletions

spec/requests/api/internal_spec.rb
spec/spec_helper.rb 0 additions, 1 deletion

spec/spec_helper.rb

with 104 additions and 141 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment