Commits · 963faeee8a0a834c0d1e6fc38ff8af582d945e7a · nexedi / gitlab-ce

22 Aug, 2018 36 commits
- Merge branch 'ce-to-ee-2018-08-22' into 'master' · 963faeee
  Stan Hu authored Aug 22, 2018
```
CE upstream - 2018-08-22 18:21 UTC

See merge request gitlab-org/gitlab-ee!6971
```
  963faeee
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-22 · 4a0fb69a
  GitLab Bot authored Aug 22, 2018
  
  4a0fb69a
- Merge branch 'sh-improve-system-hook-spec' into 'master' · 0e9dc23d
  Stan Hu authored Aug 22, 2018
```
Improve system hook spec in spec/services/git_push_service_spec.rb

See merge request gitlab-org/gitlab-ce!21347
```
  0e9dc23d
- Merge branch 'ce-to-ee-2018-08-22' into 'master' · 78be4f8c
  Dmitriy Zaporozhets authored Aug 22, 2018
```
CE upstream - 2018-08-22 12:21 UTC

Closes gitlab-ce#50549 and gitlab-qa#317

See merge request gitlab-org/gitlab-ee!6968
```
  78be4f8c
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2018-08-22 · e112b98c
  Dmitriy Zaporozhets authored Aug 22, 2018
  
  e112b98c
- Merge branch 'ee-remove-scss-variables-4' into 'master' · 22706acf
  Dmitriy Zaporozhets authored Aug 22, 2018
```
EE- remove scss variables 4

See merge request gitlab-org/gitlab-ee!6961
```
  22706acf
- Replace gl-danger css variable with red-500 in ee-only css · 0586a60b
  Dmitriy Zaporozhets authored Aug 22, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0586a60b
- Fix conflicts in CHANGELOG.md · 029382c0
  Dmitriy Zaporozhets authored Aug 22, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  029382c0
- Resolve conflicts in variables.scss · e873caa5
  Annabel Dunstone Gray authored Aug 22, 2018
  
  e873caa5
- Resolve conflicts for app/assets/javascripts/api.js · bd69d4f1
  Filipa Lacerda authored Aug 22, 2018
  
  bd69d4f1
- Merge branch 'dz-bump-gitlab-svg' into 'master' · f1315c85
  Filipa Lacerda authored Aug 22, 2018
```
Update gitlab-svgs to 1.2.8

See merge request gitlab-org/gitlab-ce!21346
```
  f1315c85
- Improve system hook spec in spec/services/git_push_service_spec.rb · 0f255668
  Stan Hu authored Aug 22, 2018
  
  0f255668
- Update gitlab-svgs to 1.2.8 · fb704072
  Dmitriy Zaporozhets authored Aug 22, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fb704072
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-22 · c8c88bcd
  GitLab Bot authored Aug 22, 2018
```
# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/api.js
#	app/assets/stylesheets/framework/variables.scss

[ci skip]
```
  c8c88bcd
- Merge branch 'sh-conditional-system-hook-push' into 'master' · f3d9e19b
  Sean McGivern authored Aug 22, 2018
```
Eliminate unnecessary and duplicate system hook fires

Closes #50549

See merge request gitlab-org/gitlab-ce!21337
```
  f3d9e19b
- Merge branch 'ide-file-templates-store' into 'master' · 726f5cdc
  Filipa Lacerda authored Aug 22, 2018
```
Added store for file templates in the Web IDE

See merge request gitlab-org/gitlab-ce!21272
```
  726f5cdc
- Merge branch 'ee-ide-file-templates-store' into 'master' · 4f277d3c
  Filipa Lacerda authored Aug 22, 2018
```
EE port of ide-file-templates-store

See merge request gitlab-org/gitlab-ee!6931
```
  4f277d3c
- Merge branch 'ce-to-ee-2018-08-21' into 'master' · cb9cdd16
  Rémy Coutable authored Aug 22, 2018
```
CE upstream - 2018-08-21 21:21 UTC

Closes gitlab-ce#40550

See merge request gitlab-org/gitlab-ee!6962
```
  cb9cdd16
- New replacement, keep single source of truth · 66066270
  Sid Sijbrandij authored Aug 22, 2018
  
  66066270
- added rewire comment to action default export · 198bb091
  Phil Hughes authored Aug 21, 2018
  
  198bb091
- Merge branch 'qa-317' into 'master' · 1c95c5ec
  Rémy Coutable authored Aug 22, 2018
```
[QA] Fix a 'superclass must be a Class' error

Closes gitlab-qa#317

See merge request gitlab-org/gitlab-ce!21340
```
  1c95c5ec
- Merge branch 'yisiliang/gitlab-ce-avoid-nil-safe_message' into 'master' · e0372801
  Rémy Coutable authored Aug 22, 2018
```
Avoid nil safe message

See merge request gitlab-org/gitlab-ce!21326
```
  e0372801
- Merge branch 'sh-bump-fog-google' into 'master' · fd4e0292
  Rémy Coutable authored Aug 22, 2018
```
Bump fog-google to 1.7.1 and google-api-client to 0.23.0

See merge request gitlab-org/gitlab-ce!21295
```
  fd4e0292
- Resolve config/routes.rb · abf0d4b3
  Rémy Coutable authored Aug 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  abf0d4b3
- Merge branch '41441-add-target-branch-name-to-cherrypick-confirmation' into 'master' · 800b50a3
  Sean McGivern authored Aug 22, 2018
```
Resolve "Cherry-picking: Confirmation message should include target branch name"

Closes #41441

See merge request gitlab-org/gitlab-ce!20846
```
  800b50a3
- Merge branch 'api-empty-commit-message' into 'master' · 1c9d26b5
  Sean McGivern authored Aug 22, 2018
```
API: Catch empty commit messages

Closes #50268, #50266, and #50265

See merge request gitlab-org/gitlab-ce!21322
```
  1c9d26b5
- Merge branch 'api-empty-project-snippets' into 'master' · 0ce13552
  Sean McGivern authored Aug 22, 2018
```
Api empty project snippets

Closes #50270

See merge request gitlab-org/gitlab-ce!21325
```
  0ce13552
- Merge branch 'dz-add-ui-to-packages' into 'master' · 1c5192ed
  Dmitriy Zaporozhets authored Aug 22, 2018
```
Add UI for maven packages feature

See merge request gitlab-org/gitlab-ee!6781
```
  1c5192ed
- Merge branch 'api-shared_group_expires-at' into 'master' · e922750e
  Sean McGivern authored Aug 22, 2018
```
API: Add shared project's expiration date

Closes #46107

See merge request gitlab-org/gitlab-ce!21104
```
  e922750e
- [QA] Fix a 'superclass must be a Class' error · 2fd1dcdb
  Rémy Coutable authored Aug 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2fd1dcdb
- Update VERSION to 11.3.0-pre · 1bbe3945
  GitLab Release Tools Bot authored Aug 22, 2018
  
  1bbe3945
- Update CHANGELOG.md for 11.2.0 · 4826c86e
  GitLab Release Tools Bot authored Aug 22, 2018
```
[ci skip]
```
  4826c86e
- Update CHANGELOG.md for 11.2.0 · f5e65d42
  GitLab Release Tools Bot authored Aug 22, 2018
```
[ci skip]
```
  f5e65d42
- Update CHANGELOG-EE.md for 11.2.0-ee · 77f67ef2
  GitLab Release Tools Bot authored Aug 22, 2018
```
[ci skip]
```
  77f67ef2
- Merge branch 'docs-update-ha-aws-diagram' into 'master' · ae623236
  Mike Lewis authored Aug 22, 2018
```
Docs update ha aws diagram

See merge request gitlab-org/gitlab-ce!21321
```
  ae623236
- Docs update ha aws diagram · 33226c8d
  Achilleas Pipinellis authored Aug 22, 2018
  
  33226c8d
21 Aug, 2018 4 commits

Merge branch 'dz-fix-sql-error-admin-users-2fa' into 'master' · fe77eb4d

Stan Hu authored Aug 21, 2018

Fix SQL error when sorting 2FA-enabled users by name in admin area

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

fe77eb4d

Merge branch 'remove-scss-variables-4' into 'master' · def895c5
Clement Ho authored Aug 21, 2018
```
Remove another batch of reassigned scss variables

See merge request gitlab-org/gitlab-ce!21334
```
def895c5
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-21 · 62e53989
GitLab Bot authored Aug 21, 2018
```
# Conflicts:
#	config/routes.rb

[ci skip]
```
62e53989

Bump fog-google to 1.7.1 and google-api-client to 0.23.0 · 9372f870

Stan Hu authored Aug 18, 2018

This is needed to support query parameters in `Fog::Storage::Google`.
See https://github.com/fog/fog-google/pull/409.

Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957

9372f870