Commits · 902f588f3f335f0a8850dc97089a66e917cfe1ea · nexedi / gitlab-ce

23 Nov, 2017 40 commits
- 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
- Merge branch 'feature/disable-password-authentication' into 'master' · b8db9c8c
  Douwe Maan authored Nov 23, 2017
```
Allow password authentication to be disabled entirely

Closes #37320

See merge request gitlab-org/gitlab-ce!15223
```
  b8db9c8c
- Allow password authentication to be disabled entirely · 257fd571
  Markus Koller authored Nov 23, 2017
  
  257fd571
- Merge branch 'siemens/gitlab-ce-feature/disable-password-authentication-ee' into 'master' · 189d14da
  Douwe Maan authored Nov 23, 2017
```
[EE] Allow password authentication to be disabled entirely

See merge request gitlab-org/gitlab-ee!3475
```
  189d14da
- Simplify the DB changes checklist · cd285a45
  Yorick Peterse authored Nov 23, 2017
```
This removes some somewhat redundant checkboxes from the template and
rephrases the introduction now that those settings are in GDK.

[ci skip]
```
  cd285a45
- Merge branch 'docs-ha-redis-roles-example' into 'master' · 2a7cb302
  Marin Jankovski authored Nov 23, 2017
```
Update example configuration to use HA roles for Redis and sentinel

See merge request gitlab-org/gitlab-ee!3532
```
  2a7cb302
- Added Rubocop config for background migrations · b3331cf3
  Yorick Peterse authored Nov 23, 2017
```
This adds a Rubocop configuration file specific to
lib/gitlab/background_migrations. This configuration will be used to
(hopefully) make reviewing background migrations easier by enforcing
stricter rules compared to the rest of GitLab. Because this
configuration is directory specific it will only affect background
migrations.
```
  b3331cf3
- Clarify firewall test and fix postgresql test command · e5c472c1
  Nick Thomas authored Nov 23, 2017
  
  e5c472c1
- Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master' · a6cafbcb
  Kamil Trzciński authored Nov 23, 2017
```
Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures

See merge request gitlab-org/gitlab-ce!15566
```
  a6cafbcb
- EE port of fix-mermaid-import · a8ccebf5
  Phil Hughes authored Nov 23, 2017
  
  a8ccebf5