Commits · 23aaef3b46349ca236bbbcc1f6d052fd53c57e4e · nexedi / gitlab-ce · GitLab

08 May, 2018 40 commits
- Resolves conflicts in repository_mirroring.md · 23aaef3b
  Tiago Botelho authored May 08, 2018
  
  23aaef3b
- "Fix" the Geo+Prometheus spec failure by removing prometheus from one of the specs · aa00e1b0
  Nick Thomas authored May 08, 2018
  
  aa00e1b0
- Click form instead of body, because clicking body would actually click inside the dropdown again · 5bfaaaa3
  Douwe Maan authored May 08, 2018
  
  5bfaaaa3
- Reset Prometheus metrics in ee/spec/services/geo/metrics_update_service_spec.rb · a818d7bb
  Stan Hu authored May 08, 2018
  
  a818d7bb
- Don't create import_state until project is persisted · 9808412a
  Douwe Maan authored May 08, 2018
  
  9808412a
- Use wiki_repo trait on project factory when wiki is used · d5c9aaad
  Douwe Maan authored May 08, 2018
  
  d5c9aaad
- Remove duplicated shared examples · 66123d44
  Douwe Maan authored May 08, 2018
  
  66123d44
- Remove stale features/steps/project/builds.rb · 28539f1f
  Stan Hu authored May 07, 2018
```
Running git log --full-history -- features/steps/project/builds.rb, you can
see that this was renamed to features/steps/project/builds/artifacts.rb in
2016 via bf7aac74. You can't see the actual changes in GitLab, but
they show up if you run git diff da866795..30e4d3ce.
```
  28539f1f
- Resolve more conflicts in db/schema.rb · deb211f9
  Ash McKenzie authored May 08, 2018
  
  deb211f9
- Resolve more conflicts in spec/spec_helper.rb · ad152c0d
  Ash McKenzie authored May 08, 2018
  
  ad152c0d
- Resolve more conflicts in app/models/project.rb · dcb2b311
  Stan Hu authored May 07, 2018
  
  dcb2b311
- Resolve conflicts in doc/workflow/repository_mirroring.md · 6452c9c7
  Ash McKenzie authored May 08, 2018
  
  6452c9c7
- Resolve conflicts in spec/javascripts/vue_mr_widget/mock_data.js · 1b0ce2a6
  Ash McKenzie authored May 08, 2018
  
  1b0ce2a6
- Resolve conflicts in lib/gitlab/ci/pipeline/chain/command.rb · 5c96525c
  Ash McKenzie authored May 08, 2018
  
  5c96525c
- Resolve conflicts in spec/models/repository_spec.rb · 1b4e575f
  Ash McKenzie authored May 08, 2018
  
  1b4e575f
- Resolve conflicts in spec/models/remote_mirror_spec.rb · f64aa8c8
  Ash McKenzie authored May 08, 2018
  
  f64aa8c8
- Resolve conflicts in spec/models/project_spec.rb · 068a418d
  Ash McKenzie authored May 08, 2018
  
  068a418d
- Resolve conflicts in app/views/projects/settings/repository/show.html.haml · 0e4025bd
  Ash McKenzie authored May 08, 2018
  
  0e4025bd
- Resolve conflicts in app/views/admin/application_settings/show.html.haml · 9a14ed50
  Ash McKenzie authored May 08, 2018
  
  9a14ed50
- Resolve conflicts in app/views/admin/application_settings/_repository_mirrors_form.html.haml · 9abf2680
  Ash McKenzie authored May 08, 2018
  
  9abf2680
- Resolve conflicts in app/services/concerns/exclusive_lease_guard.rb · 75f1b586
  Ash McKenzie authored May 08, 2018
  
  75f1b586
- Resolve conflicts in app/serializers/project_mirror_entity.rb · 2c82998a
  Ash McKenzie authored May 08, 2018
  
  2c82998a
- Resolve conflicts in app/models/remote_mirror.rb · 6bca1fee
  Ash McKenzie authored May 08, 2018
  
  6bca1fee
- Resolve conflicts in lib/gitlab/import_export/import_export.yml · 459ce33a
  Ash McKenzie authored May 08, 2018
  
  459ce33a
- Resolve conflicts in spec/lib/gitlab/usage_data_spec.rb · 603135d4
  Stan Hu authored May 07, 2018
```
3396edce got reverted in a CE->EE merge: f4dd12eb.
```
  603135d4
- Resolve conflicts in lib/gitlab/usage_data.rb · fc0e8aed
  Stan Hu authored May 07, 2018
```
3396edce got reverted in a CE->EE merge: f4dd12eb.
```
  fc0e8aed
- Resolve conflicts in config/routes/project.rb · e6142470
  Ash McKenzie authored May 08, 2018
  
  e6142470
- Resolve conflicts in config/sidekiq_queues.yml · 9a208719
  Ash McKenzie authored May 08, 2018
  
  9a208719
- Resolve conflicts in package.json · e2dc0700
  Mike Greiling authored May 08, 2018
```
[ci-skip]
```
  e2dc0700
- Resolve conflicts in config/webpack.config.js · 002b02fe
  Mike Greiling authored May 08, 2018
```
[ci-skip]
```
  002b02fe
- Resolve conflicts in app/assets/javascripts/main.js · f72f95c9
  Mike Greiling authored May 08, 2018
  
  f72f95c9
- Resolve conflicts in spec/factories/projects.rb · 15bb6daa
  Ash McKenzie authored May 08, 2018
  
  15bb6daa
- Resolve conflicts in app/models/project.rb · e931893e
  Stan Hu authored May 07, 2018
  
  e931893e
- Reolve conflicts in app/controllers/projects/settings/repository_controller.rb · a2003f2f
  Stan Hu authored May 07, 2018
  
  a2003f2f
- Resolve conflicts in app/controllers/projects/mirrors_controller.rb · ab24e114
  Stan Hu authored May 07, 2018
  
  ab24e114
- Fix conflicts · 095c3299
  Shinya Maeda authored May 08, 2018
  
  095c3299
- Resolve conflicts in config/routes/group.rb · a593e467
  Mario de la Ossa authored May 07, 2018
  
  a593e467
- Resolve conflicts in db/schema.rb · 75ed6921
  Stan Hu authored May 07, 2018
  
  75ed6921
- Resolve conflicts in db/migrate/20180503193953_add_mirror_available_to_application_settings.rb · 940948f9
  Stan Hu authored May 07, 2018
  
  940948f9
- Resolve conflicts in db/migrate/20180503193542_add_indexes_to_remote_mirror.rb · f13a1e5f
  Stan Hu authored May 07, 2018
  
  f13a1e5f