Commits · 56cac7d53c1195a66174deab6b038c1636bb6f16 · nexedi / gitlab-ce

24 Nov, 2017 6 commits
- 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
- 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
- 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 34 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
- Resolve conflict in db/schema.rb · 1919e4a4
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1919e4a4
- Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-11-22 · d38949ee
  Rémy Coutable authored Nov 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d38949ee
- Merge branch 'jej/protected-branch-api-includes-user-ids' into 'master' · 80e00cb2
  Dmitriy Zaporozhets authored Nov 23, 2017
```
ProtectedBranch API includes user_id/group_id in access levels

Closes #4152

See merge request gitlab-org/gitlab-ee!3535
```
  80e00cb2
- Merge branch 'fix-mermaid-import' into 'master' · d22c8857
  Filipa Lacerda authored Nov 23, 2017
```
Fixed import of render mermaid & render math methods

See merge request gitlab-org/gitlab-ce!15550
```
  d22c8857
- Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master' · 3026cb20
  Rémy Coutable authored Nov 23, 2017
```
Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateService

See merge request gitlab-org/gitlab-ce!15575
```
  3026cb20
- Merge branch 'simplify-db-changes-template' into 'master' · 505cba59
  Rémy Coutable authored Nov 23, 2017
```
Simplify the DB changes checklist

See merge request gitlab-org/gitlab-ce!15577
```
  505cba59
- Merge branch '39887-move-identical-check-to-merged-branches-ee' into 'master' · ca1d1894
  Douwe Maan authored Nov 23, 2017
```
EE: Move identical merged branch check to merged_branch_names

See merge request gitlab-org/gitlab-ee!3533
```
  ca1d1894
- Merge branch '39887-move-identical-check-to-merged-branches' into 'master' · dbf97574
  Douwe Maan authored Nov 23, 2017
```
Move identical merged branch check to merged_branch_names

Closes #39887

See merge request gitlab-org/gitlab-ce!15464
```
  dbf97574
- Merge branch 'reviewing-db-changes' into 'master' · deda88f9
  Rémy Coutable authored Nov 23, 2017
```
Added Rubocop config for background migrations

See merge request gitlab-org/gitlab-ce!15576
```
  deda88f9
- Merge branch 'use-merge-requests-diff-id-column' into 'master' · ad70fb7b
  Douwe Maan authored Nov 23, 2017
```
Use foreign key to get latest MR diff

Closes #37631

See merge request gitlab-org/gitlab-ce!15126
```
  ad70fb7b
- Merge branch 'ee-fix-mermaid-import' into 'master' · f700c5d9
  Filipa Lacerda authored Nov 23, 2017
```
EE port of fix-mermaid-import

See merge request gitlab-org/gitlab-ee!3531
```
  f700c5d9
- Merge branch '4150-geo-docfix' into 'master' · 68524746
  Achilleas Pipinellis authored Nov 23, 2017
```
Clarify firewall test and fix postgresql test command

Closes #4150

See merge request gitlab-org/gitlab-ee!3538
```
  68524746
- ProtectedBranch API includes user_id/group_id in access levels · 8fcbe210
  James Edwards-Jones authored Nov 22, 2017
```
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4152
```
  8fcbe210
- Merge branch 'jk-group-mentions-fix' into 'master' · 038f5a41
  Sean McGivern authored Nov 23, 2017
```
Fix link text from group context

Closes gitlab-ee#4100

See merge request gitlab-org/gitlab-ce!15565
```
  038f5a41