Commits · 09bdd7d56728c7b2490b89a6562adedf267b7599 · nexedi / gitlab-ce · GitLab

24 Nov, 2017 20 commits
- Merge branch 'jej/fix-protected-branch-validations' into 'master' · 09bdd7d5
  Rémy Coutable authored Nov 24, 2017
```
Fix ProtectedBranch access level validations

See merge request gitlab-org/gitlab-ee!3542
```
  09bdd7d5
- Merge branch 'ce-to-ee-2017-11-22' into 'master' · 5b7abbac
  Rémy Coutable authored Nov 24, 2017
```
CE upstream - Wednesday

Closes #4100, gitlab-com/gitlab-docs#142, #3711, gitaly#758, gitlab-ce#40283, gitlab-ce#40295, gitlab-com/infrastructure#3240, gitaly#742, gitlab-ce#39821, gitlab-qa#102, gitaly#740, gitlab-ce#31825 et gitlab-ce#39497

See merge request gitlab-org/gitlab-ee!3522
```
  5b7abbac
- Deduplicate protected ref human_access_levels · 9f285527
  James Edwards-Jones authored Nov 24, 2017
```
Previously these were duplicated so they could be different for push/merge,
but this was no longer necessary after
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232
```
  9f285527
- Fix ProtectedBranch access level validations · bd79d91b
  James Edwards-Jones authored Nov 24, 2017
```
Before an access_level was required in EE even when an
it had been set for a user/group.
```
  bd79d91b
- Resolve conflict in spec/lib/gitlab/git/repository_spec.rb · cf9c8834
  Rémy Coutable authored Nov 24, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cf9c8834
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-11-22 · 34ea8039
  Rémy Coutable authored Nov 24, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  34ea8039
- Merge branch 'docs/build-47-add-fully-worked-examples' into 'master' · 8a72b78b
  Marin Jankovski authored Nov 24, 2017
```
Add example configurations for PG HA

Closes gitlab-org/build/team-tasks#47

See merge request gitlab-org/gitlab-ee!3449
```
  8a72b78b
- Explain the tradeoffs of the minimal example · 4c8d94e3
  Richard Clamp authored Nov 24, 2017
  
  4c8d94e3
- Merge branch 'dm-cleanup-fetch-and-mirror-methods-ee' into 'master' · f53d2731
  Sean McGivern authored Nov 24, 2017
```
Cleanup fetch and mirror methods

See merge request gitlab-org/gitlab-ee!3396
```
  f53d2731
- Update yarn.lock after yarn install v1.0.2 · 56cac7d5
  Rémy Coutable authored Nov 24, 2017
```
[1/4] Resolving packages...
success Already up-to-date.
Done in 0.50s.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  56cac7d5
- Specify 'on each server' more strongly · d1ad5980
  Richard Clamp authored Nov 24, 2017
  
  d1ad5980
- Don't say how big our solutions are in the heading · e5c2ba8f
  Richard Clamp authored Nov 24, 2017
```
If we decide to change the description links will be screwy
```
  e5c2ba8f
- Fix typo in example · 2b57ce6c
  Richard Clamp authored Nov 24, 2017
  
  2b57ce6c
- Resolve yarn conflicts · bb83e431
  Lin Jen-Shin authored Nov 24, 2017
  
  bb83e431
- Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-11-22 · dc203d2f
  Lin Jen-Shin authored Nov 24, 2017
```
* ee/master:
  Add classList polyfill for IE classList.toggle(.., force)
```
  dc203d2f
- Rename fetch_refs to refmap · 313b1e95
  Douwe Maan authored Nov 23, 2017
  
  313b1e95
- Clean up repository fetch and mirror methods · 254c5686
  Douwe Maan authored Nov 15, 2017
  
  254c5686
- Merge branch 'ee-38916-add-classlist-polyfill' into 'master' · 7e49a1ef
  Filipa Lacerda authored Nov 24, 2017
```
Add classList polyfill for IE classList.toggle(.., force) -- EE merge edition

Closes gitlab-ce#38916

See merge request gitlab-org/gitlab-ee!3527
```
  7e49a1ef
- Fix a RuboCop offense · eeb41bbb
  Rémy Coutable authored Nov 24, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  eeb41bbb
- Add classList polyfill for IE classList.toggle(.., force) · b548c344
  Eric Eastwood authored Nov 24, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38916
```
  b548c344
23 Nov, 2017 20 commits
- Resolve conflict in yarn.lock · f09961fa
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f09961fa
- Resolve conflict in spec/javascripts/pipelines/pipelines_spec.js · ea9cb5c4
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ea9cb5c4
- Resolve conflict in spec/javascripts/environments/folder/environments_folder_view_spec.js · 3aec0499
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3aec0499
- Resolve conflict in spec/javascripts/environments/environments_app_spec.js · 902f588f
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  902f588f
- Resolve conflict in spec/javascripts/environments/emtpy_state_spec.js · 3c50e0ed
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3c50e0ed
- Resolve conflict in lib/gitlab/git/repository.rb · 2108e636
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2108e636
- Resolve conflict in app/controllers/application_controller.rb · 7d362b41
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7d362b41
- Resolve conflict in app/assets/javascripts/render_gfm.js · 5e9c501d
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5e9c501d
- Resolve conflict in app/assets/javascripts/pipelines/components/pipelines.vue · 9ba243a5
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9ba243a5
- Resolve conflict in app/assets/javascripts/environments/stores/environments_store.js · bab361d8
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bab361d8
- Resolve conflict in app/assets/javascripts/environments/mixins/environments_mixin.js · 9613f1d7
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9613f1d7
- Resolve conflict in app/assets/javascripts/environments/components/environments_app.vue · c4422453
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c4422453
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-11-22 · 91d0d91f
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  91d0d91f
- Resolve conflict in app/assets/javascripts/environments/folder/environments_folder_view.vue · 423dde58
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  423dde58
- Resolve conflict in app/assets/javascripts/environments/folder/environments_folder_bundle.js · 9008c015
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9008c015
- Resolve conflict in spec/javascripts/environments/environment_table_spec.js · cfa58afc
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cfa58afc
- Resolve conflict in app/assets/javascripts/environments/components/environments_table.vue · dd337389
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  dd337389
- Resolve conflict in app/assets/javascripts/environments/components/environment.vue · ae74d36d
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ae74d36d
- Resolve conflict in spec/requests/api/settings_spec.rb · e7a62b13
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e7a62b13
- Resolve conflict in lib/api/settings.rb · 13f26577
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  13f26577