Commits · 1cc3f5c3776c772786b753132b0aaba407d7ebb0 · nexedi / gitlab-ce

26 Mar, 2018 24 commits
- Make #base_pipeline returning the latest available pipeline for MR's base commit · 1cc3f5c3
  Olivier Gonzalez authored Mar 26, 2018
  
  1cc3f5c3
- Merge branch 'backstage/gb/populating-pipeline-refactoring-ee' into 'master' · d5e8beb2
  Kamil Trzciński authored Mar 26, 2018
```
Pipeline creation service refactoring / EE

See merge request gitlab-org/gitlab-ee!5072
```
  d5e8beb2
- Merge branch 'geo-fix-wiki-moving' into 'master' · 80221cd4
  Nick Thomas authored Mar 26, 2018
```
[Geo] Fix project rename when wiki does not exist

See merge request gitlab-org/gitlab-ee!5076
```
  80221cd4
- Merge branch 'docs-organize-by-category-ee' into 'master' · b17e7d7c
  🚄 Job van der Voort 🚀 authored Mar 26, 2018
```
Docs organize main page by product category

See merge request gitlab-org/gitlab-ee!5052
```
  b17e7d7c
- Docs organize main page by product category · fa2b4509
  Marcia Ramos authored Mar 26, 2018
  
  fa2b4509
- Merge branch 'ce-to-ee-2018-03-26' into 'master' · 37a84198
  Marin Jankovski authored Mar 26, 2018
```
CE upstream - 2018-03-26 09:28 UTC

See merge request gitlab-org/gitlab-ee!5111
```
  37a84198
- Merge branch 'move-app-lib-ee' into 'master' · c8a7aeab
  Nick Thomas authored Mar 26, 2018
```
Move the rest EE files from app and lib

See merge request gitlab-org/gitlab-ee!5057
```
  c8a7aeab
- ProtectedBranch API omits empty declared params · 5373480e
  James Edwards-Jones authored Mar 26, 2018
  
  5373480e
- Merge branch... · 887af081
  Stan Hu authored Mar 26, 2018
```
Merge branch '5409-geo-recovery-from-geo-temporary-directory-doesn-t-work-if-the-namespace-directory-doesn-t-exist' into 'master'

Resolve "Geo: Recovery from @geo-temporary directory doesn't work if the namespace directory doesn't exist"

Closes #5409

See merge request gitlab-org/gitlab-ee!5100
```
  887af081
- Merge branch 'chat-responder-slack-app' into 'master' · 25d51bc7
  Kamil Trzciński authored Mar 26, 2018
```
Define a chat responder for the Slack app

Closes #5383

See merge request gitlab-org/gitlab-ee!5077
```
  25d51bc7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-26 · e9903338
  GitLab Bot authored Mar 26, 2018
  
  e9903338
- Merge branch 'fix-40798-namespace-forking' into 'master' · 0f85102d
  Douwe Maan authored Mar 26, 2018
```
Resolve "Forking with namespace doesn't work (API)"

Closes #40798

See merge request gitlab-org/gitlab-ce!17815
```
  0f85102d
- Resolve "Forking with namespace doesn't work (API)" · 54baf3a3
  Jan authored Mar 26, 2018
  
  54baf3a3
- Merge branch '40843-update-grape-to-v1-0-2-when-it-is-released' into 'master' · bf272756
  Douwe Maan authored Mar 26, 2018
```
Resolve "Update grape to v1.0.2 when it is released"

Closes #40843

See merge request gitlab-org/gitlab-ce!17983
```
  bf272756
- Merge branch 'docs/rs-update-changelog' into 'master' · 9148434e
  Douwe Maan authored Mar 26, 2018
```
Add missing changelog entries for 10.6.0

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

[ci skip]
```
  9148434e
- Merge branch 'bvl-classification-only' into 'master' · e78d9834
  Douwe Maan authored Mar 26, 2018
```
Allow enabling External Policy Control without URL

Closes #4786

See merge request gitlab-org/gitlab-ee!5083
```
  e78d9834
- Make stage seed instance variables less ambiguous · 25505d97
  Grzegorz Bizon authored Mar 26, 2018
  
  25505d97
- Remove outdates TODOs from pipeline class · f71b2670
  Grzegorz Bizon authored Mar 23, 2018
  
  f71b2670
- Merge branch '44581-meta-use-prettier-ignore-file-in-our-save-script' into 'master' · bb454395
  Phil Hughes authored Mar 26, 2018
```
Make use of the prettier ignore file during our save script

Closes #44581

See merge request gitlab-org/gitlab-ce!17960
```
  bb454395
- Make use of the prettier ignore file during our save script · d023244a
  Lukas Eipert authored Mar 26, 2018
  
  d023244a
- Merge branch 'ce-to-ee-2018-03-26' into 'master' · 58ee6fc1
  Stan Hu authored Mar 26, 2018
```
CE upstream - 2018-03-26 00:25 UTC

See merge request gitlab-org/gitlab-ee!5109
```
  58ee6fc1
- Resolve conflicts in config/webpack.config.js · 8132e839
  Stan Hu authored Mar 25, 2018
  
  8132e839
- Updated grape to `1.0.2` to remove workaround · a47565aa
  James Edwards-Jones authored Mar 26, 2018
  
  a47565aa
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-26 · c03f4141
  GitLab Bot authored Mar 26, 2018
```
# Conflicts:
#	config/webpack.config.js

[ci skip]
```
  c03f4141
25 Mar, 2018 2 commits

Merge branch 'ce-to-ee-2018-03-23' into 'master' · b38f4bbf

Stan Hu authored Mar 25, 2018

CE upstream - 2018-03-23 18:25 UTC

Closes gitaly#1101, #4683, and gitlab-com/infrastructure#19

See merge request gitlab-org/gitlab-ee!5102

b38f4bbf

Merge branch '28857-followup-fix-pages-test' into 'master' · 954ad7e9
Robert Speicher authored Mar 23, 2018
```
Fix a test that is going to break, that has not broken yet

See merge request gitlab-org/gitlab-ce!17966
```
954ad7e9

24 Mar, 2018 4 commits
- Resolve conflicts in app/models/group.rb · 8a5b3f8d
  Stan Hu authored Mar 24, 2018
  
  8a5b3f8d
- Make CE and EE files consistent in spec/initializers/6_validations_spec.rb · f30448e8
  Stan Hu authored Mar 24, 2018
  
  f30448e8
- Resolve conflicts in spec/initializers/6_validations_spec.rb · c6ebb26a
  Stan Hu authored Mar 24, 2018
  
  c6ebb26a
- Resolve conflict in app/helpers/application_settings_helper.rb · 2822861e
  Stan Hu authored Mar 24, 2018
  
  2822861e
23 Mar, 2018 10 commits
- Merge branch 'mk/geo/fix-disabled-wiki-registry' into 'master' · 368e60da
  Stan Hu authored Mar 23, 2018
```
Geo: Mark disabled wiki as fully synced

Closes #5427

See merge request gitlab-org/gitlab-ee!5104
```
  368e60da
- Add missing changelog entries for 10.6.0 · 7816f2ae
  Robert Speicher authored Mar 23, 2018
  
  7816f2ae
- Add changelog · 8626d6a7
  Michael Kozono authored Mar 23, 2018
  
  8626d6a7
- Mark disabled wiki as fully synced · 6829b846
  Michael Kozono authored Mar 23, 2018
  
  6829b846
- Merge branch '4994-geo-log-jid-for-sync-related-jobs' into 'master' · 89d99723
  Stan Hu authored Mar 23, 2018
```
Resolve "[Geo] Log JID for sync related jobs"

Closes #4994

See merge request gitlab-org/gitlab-ee!5007
```
  89d99723
- Resolve conflict in `safe_model_attributes.yml` · df179a2d
  Bob Van Landuyt authored Mar 23, 2018
```
[skip ci]
```
  df179a2d
- Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master' · 391732a2
  Robert Speicher authored Mar 23, 2018
```
[Rails5] Update files by `rails app:update`

See merge request gitlab-org/gitlab-ce!17828
```
  391732a2
- Merge branch '28857-followup-fix-pages-test' into 'master' · 93e216e6
  Robert Speicher authored Mar 23, 2018
```
Fix a test that is going to break, that has not broken yet

See merge request gitlab-org/gitlab-ce!17966
```
  93e216e6
- [Geo] Log Sidekiq context for sync related jobs · fe1625bb
  Valery Sizov authored Mar 17, 2018
  
  fe1625bb
- Merge branch 'mk/geo/mark-disabled-wikis-as-synced' into 'master' · 73d1fab8
  Stan Hu authored Mar 23, 2018
```
Geo: Remove disabled wikis from out-of-sync queries

Closes #5361

See merge request gitlab-org/gitlab-ee!5089
```
  73d1fab8