Commits · 51bc2ee25b3b0687e7f41e66f4db1a49c0f83725 · nexedi / gitlab-ce

31 Aug, 2018 7 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-31 · 51bc2ee2
  GitLab Bot authored Aug 31, 2018
```
# Conflicts:
#	doc/administration/compliance.md
#	doc/administration/index.md

[ci skip]
```
  51bc2ee2
- Merge branch 'reorganize-issues-and-mrs-feature-specs' into 'master' · 9248240c
  Sean McGivern authored Aug 31, 2018
```
Reorganize issues and merge request feature specs in the same folder

See merge request gitlab-org/gitlab-ce!21435
```
  9248240c
- Merge branch 'compliance-docs' into 'master' · 0cab7882
  Achilleas Pipinellis authored Aug 31, 2018
```
Add initial Compliance doc based on features.yml Compliance features

See merge request gitlab-org/gitlab-ce!21267
```
  0cab7882
- Add initial Compliance doc based on features.yml Compliance features · 2e1265d5
  Mike Lewis authored Aug 31, 2018
  
  2e1265d5
- Merge branch 'compliance-docs' into 'master' · 46533fde
  Achilleas Pipinellis authored Aug 31, 2018
```
Port to EE: New Compliance doc

See merge request gitlab-org/gitlab-ee!7076
```
  46533fde
- Port to EE: New Compliance doc · b6e163de
  Mike Lewis authored Aug 31, 2018
  
  b6e163de
- Merge branch 'winh-fix-pdf-page-spec-timing' into 'master' · 29df3f1d
  Filipa Lacerda authored Aug 31, 2018
```
Remove waiting from PDF page component test

See merge request gitlab-org/gitlab-ce!21365
```
  29df3f1d
30 Aug, 2018 33 commits
- Merge branch 'ce-to-ee-2018-08-30' into 'master' · 3f3540fd
  Stan Hu authored Aug 30, 2018
```
CE upstream - 2018-08-30 18:22 UTC

See merge request gitlab-org/gitlab-ee!7101
```
  3f3540fd
- Resolve conflicts in local/gitlab.pot · 11a86807
  Stan Hu authored Aug 30, 2018
  
  11a86807
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-30 · 68d3119c
  GitLab Bot authored Aug 30, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  68d3119c
- Merge branch 'ce-to-ee-2018-08-30' into 'master' · b99a1fa4
  Sean McGivern authored Aug 30, 2018
```
CE upstream - 2018-08-30 15:22 UTC

See merge request gitlab-org/gitlab-ee!7094
```
  b99a1fa4
- Merge branch 'ide-multiple-file-uploads' into 'master' · 9c491bc6
  Filipa Lacerda authored Aug 30, 2018
```
Enabled multiple uploads in the Web IDE

Closes #50405

See merge request gitlab-org/gitlab-ce!21412
```
  9c491bc6
- Merge branch '47943-project-milestone-page-deprecation-message' into 'master' · f2272c15
  Filipa Lacerda authored Aug 30, 2018
```
Show deprecation message on project milestone page for category tabs

Closes #47943

See merge request gitlab-org/gitlab-ce!21236
```
  f2272c15
- Merge branch 'patch-28' into 'master' · 1bd37c4c
  Rémy Coutable authored Aug 30, 2018
```
corrects microsoft_teams.md webhook url in docs

See merge request gitlab-org/gitlab-ce!21399
```
  1bd37c4c
- Merge branch 'docs-change-to-sentence-case' into 'master' · 3d499541
  Victor Wu authored Aug 30, 2018
```
Change to sentence case

See merge request gitlab-org/gitlab-ee!7095
```
  3d499541
- Change to sentence case · 0726ade8
  Victor Wu authored Aug 30, 2018
  
  0726ade8
- Solve conflicts for locale/gitlab.pot, build_service.rb · dab323c0
  Jose Vargas authored Aug 30, 2018
  
  dab323c0
- Merge branch 'winh-upgrade-license-finder' into 'master' · 6afdf742
  Rémy Coutable authored Aug 30, 2018
```
Upgrade LicenseFinder Gem to v5.4.0

See merge request gitlab-org/gitlab-ce!21431
```
  6afdf742
- Upgrade LicenseFinder Gem to v5.4.0 · 9b7753ed
  Winnie Hellmann authored Aug 30, 2018
  
  9b7753ed
- Merge branch 'schema-changed-ee-backport' into 'master' · ff0a5936
  Rémy Coutable authored Aug 30, 2018
```
Backport schema_changed.sh from EE which prints the diff if the schema is different

See merge request gitlab-org/gitlab-ce!21422
```
  ff0a5936
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-30 · b08bb9e9
  GitLab Bot authored Aug 30, 2018
```
# Conflicts:
#	app/services/users/build_service.rb
#	locale/gitlab.pot

[ci skip]
```
  b08bb9e9
- Reorganize issues and merge request feature specs in the same folder · d004c768
  Rémy Coutable authored Aug 30, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d004c768
- Merge branch 'sh-backport-groups-png-docs' into 'master' · 40935fd7
  Rémy Coutable authored Aug 30, 2018
```
Backport doc/user/group/img/groups.png changes from EE

See merge request gitlab-org/gitlab-ce!21415
```
  40935fd7
- Merge branch 'ce-to-ee-2018-08-30' into 'master' · 490d0f94
  Sean McGivern authored Aug 30, 2018
```
CE upstream - 2018-08-30 12:21 UTC

See merge request gitlab-org/gitlab-ee!7080
```
  490d0f94
- Merge branch 'update-11-2-3-and-11-1-6' into 'master' · 418d35d9
  Stan Hu authored Aug 30, 2018
```
Add changelog entries for 11.2.3 and 11.1.6

See merge request gitlab-org/gitlab-ce!21425
```
  418d35d9
- Merge branch 'feature/whitelist-new-users-as-internal' into 'master' · f89f6b0a
  Phil Hughes authored Aug 30, 2018
```
Allow whitelisting for "external collaborator by default" setting

See merge request gitlab-org/gitlab-ce!17711
```
  f89f6b0a
- Allow whitelisting for "external collaborator by default" setting · 93b9bfd9
  Roger Rüttimann authored Aug 30, 2018
  
  93b9bfd9
- Merge branch 'ee-feature/whitelist-new-users-as-internal' into 'master' · a32a0ed1
  Phil Hughes authored Aug 30, 2018
```
Allow whitelisting for "external collaborator by default" setting

See merge request gitlab-org/gitlab-ee!7075
```
  a32a0ed1
- Merge branch 'fj-47229-fix-logo-lfs-tracked' into 'master' · 3113fb84
  Sean McGivern authored Aug 30, 2018
```
Fixed project logo when it is LFS tracked

Closes #47229

See merge request gitlab-org/gitlab-ce!20948
```
  3113fb84
- Fixed project logo when it is LFS tracked · edb5759c
  Francisco Javier López authored Aug 30, 2018
  
  edb5759c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-30 · 2dac3843
  GitLab Bot authored Aug 30, 2018
  
  2dac3843
- Add changelog entries for 11.2.3 and 11.1.6 · 7e7998c4
  Sean McGivern authored Aug 30, 2018
  
  7e7998c4
- Merge branch '41292-users-stuck-on-a-redirect-loop-after-transferring-project' into 'master' · b8856d66
  Sean McGivern authored Aug 30, 2018
```
Resolve "Users stuck on a redirect loop after transferring project"

Closes #41292

See merge request gitlab-org/gitlab-ce!21408
```
  b8856d66
- Merge branch '50414-rubocop-rule-to-enforce-class-methods-over-module' into 'master' · f474f16f
  Sean McGivern authored Aug 30, 2018
```
Resolve "Make a Rubocop cop to prefer class_methods over ClassMethods for ActiveSupport::Concern"

Closes #50414

See merge request gitlab-org/gitlab-ce!21379
```
  f474f16f
- Merge branch '50414-rubocop-rule-to-enforce-class-methods-over-module' into 'master' · 7b68798b
  Sean McGivern authored Aug 30, 2018
```
CE Port 50414 rubocop rule to enforce class methods over module

See merge request gitlab-org/gitlab-ee!7047
```
  7b68798b
- Merge branch 'update-hint-for-local-merge' into 'master' · f4d04ee9
  Sean McGivern authored Aug 30, 2018
```
Updates hint text for merging branches locally.

Closes #39398

See merge request gitlab-org/gitlab-ce!21421
```
  f4d04ee9
- Merge branch 'sh-fix-error-500-updating-wikis' into 'master' · 8479b3b6
  Sean McGivern authored Aug 30, 2018
```
Fix Error 500s due to encoding issues when Wiki hooks fire

Closes #50590

See merge request gitlab-org/gitlab-ce!21414
```
  8479b3b6
- fix path bug and update specs · 14949ba6
  James Lopez authored Aug 30, 2018
  
  14949ba6
- Backport schema_changed.sh from EE which prints the diff if the schema is different · 8f51727d
  Jasper Maes authored Aug 30, 2018
  
  8f51727d
- Updates hint text for merging branches locally. · 23f14e44
  Pradyumna authored Aug 29, 2018
```
- Hint essentially states that a user should first update their target branch
  with upstream changes and then perform the merge.
```
  23f14e44