Commits · 9bcd3fd483ed7459913fd77dc9455764a1a6235c · nexedi / gitlab-ce

04 Apr, 2018 40 commits
- Merge branch '5555-no-method-error' into 'master' · 9bcd3fd4
  Stan Hu authored Apr 04, 2018
```
Resolve "NoMethodError: undefined method `log_info' for Geo::RepositorySyncWorker"

Closes #5555

See merge request gitlab-org/gitlab-ee!5223
```
  9bcd3fd4
- Merge branch 'alternate-incoming-mail-address-for-gitlab-com' into 'master' · 552dad1f
  Sean McGivern authored Apr 04, 2018
```
Allow an alternate incoming email address for GitLab.com

See merge request gitlab-org/gitlab-ee!5225
```
  552dad1f
- Merge branch 'ce-to-ee-2018-04-04' into 'master' · 6f4e81ad
  Rémy Coutable authored Apr 04, 2018
```
CE upstream - 2018-04-04 15:28 UTC

See merge request gitlab-org/gitlab-ee!5226
```
  6f4e81ad
- Merge branch 'ee-dz-improve-app-settings-6' into 'master' · 1d086e82
  Filipa Lacerda authored Apr 04, 2018
```
Redesign application settings to match project settings (part 6, final)

See merge request gitlab-org/gitlab-ee!5222
```
  1d086e82
- Merge branch 'osw-41401-render-mr-commit-sha-instead-diffs-ee' into 'master' · 5c5832cf
  Sean McGivern authored Apr 04, 2018
```
[https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18141 Port] Render MR commit SHA instead "diffs" when viable on GFM

See merge request gitlab-org/gitlab-ee!5224
```
  5c5832cf
- Resolve conflict in spec/requests/api/projects_spec.rb · 0dabdf68
  Rémy Coutable authored Apr 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0dabdf68
- Resolve conflict in lib/api/projects.rb · c01ae494
  Rémy Coutable authored Apr 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c01ae494
- Resolve conflict in doc/api/projects.md · fddfeacc
  Rémy Coutable authored Apr 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fddfeacc
- Resolve conflict in changelogs/unreleased/39880-merge-method-api.yml · 8c455270
  Rémy Coutable authored Apr 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8c455270
- Merge branch 'ee-issue_40915' into 'master' · dc360321
  Sean McGivern authored Apr 04, 2018
```
EE-PORT Allow assigning and filtering issuables by ancestor group labels

See merge request gitlab-org/gitlab-ee!5118
```
  dc360321
- EE-PORT Allow assigning and filtering issuables by ancestor group labels · 652e9cf5
  Felipe Artur authored Apr 04, 2018
  
  652e9cf5
- Allow an alternate incoming email address for GitLab.com · 3d822bef
  Sean McGivern authored Apr 04, 2018
```
This is temporary, until we switch completely:
https://about.gitlab.com/2018/03/06/reconfigure-inbound-email-for-gitlab-notification/
```
  3d822bef
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-04 · 8cc7570f
  GitLab Bot authored Apr 04, 2018
```
# Conflicts:
#	changelogs/unreleased/39880-merge-method-api.yml
#	doc/api/projects.md
#	lib/api/projects.rb
#	spec/requests/api/projects_spec.rb

[ci skip]
```
  8cc7570f
- Merge branch 'pdeden/gitlab-ee-patch-7' into 'master' · aff9bf11
  Achilleas Pipinellis authored Apr 04, 2018
```
Fix syntax error in the `Envoy.blade.php` example

See merge request gitlab-org/gitlab-ce!18177
```
  aff9bf11
- Merge branch 'feature_detect_co_authored_commits' into 'master' · f8365c3d
  Douwe Maan authored Apr 04, 2018
```
Add banzai filter to detect commit message trailers and properly link the users

Closes #31640

See merge request gitlab-org/gitlab-ce!17919
```
  f8365c3d
- Add banzai filter to detect commit message trailers and properly link the users · a069aa49
  Omar Mekky authored Apr 04, 2018
  
  a069aa49
- Merge branch 'ce-to-ee-2018-04-04' into 'master' · 380cc283
  Rémy Coutable authored Apr 04, 2018
```
CE upstream - 2018-04-04 09:39 UTC

Closes gitaly#1110

See merge request gitlab-org/gitlab-ee!5221
```
  380cc283
- Render MR commit SHA instead "diffs" when viable · 448cd057
  Oswaldo Ferreira authored Apr 02, 2018
  
  448cd057
- Merge branch 'sh-gitlab-sidekiq-logger' into 'master' · b15dd5df
  Sean McGivern authored Apr 04, 2018
```
Add support for Sidekiq JSON logging

Closes #20060

See merge request gitlab-org/gitlab-ce!18121
```
  b15dd5df
- Merge branch 'zj-revert-bad-grouping' into 'master' · 873a1d93
  Grzegorz Bizon authored Apr 04, 2018
```
Revert "Allow CI/CD Jobs being grouped on version strings"

Closes #44615

See merge request gitlab-org/gitlab-ce!18170
```
  873a1d93
- Merge branch 'zj-feature-gate-remove-http-api' into 'master' · e43c01e6
  Douwe Maan authored Apr 04, 2018
```
Allow feature gate removal through the API

See merge request gitlab-org/gitlab-ce!18146
```
  e43c01e6
- Add changelog · 2361be18
  Nick Thomas authored Apr 04, 2018
  
  2361be18
- Add Gitlab::Geo::LogHelpers to Geo::Scheduler::PerShardSchedulerWorker · 52b19c35
  Nick Thomas authored Apr 04, 2018
  
  52b19c35
- Revert changelog entry for removed feature · 695684c8
  Zeger-Jan van de Weg authored Apr 04, 2018
  
  695684c8
- Convert Geo::Scheduler::SchedulerWorker to use Gitlab::Geo::LogHelpers · b1226f6f
  Nick Thomas authored Apr 04, 2018
  
  b1226f6f
- Revert "Allow CI/CD Jobs being grouped on version strings" · 16ea3315
  Zeger-Jan van de Weg authored Apr 04, 2018
```
This reverts commit 4f2cdb51.
```
  16ea3315
- Add support for Sidekiq JSON logging · 6415ac9e
  Stan Hu authored Apr 01, 2018
```
Closes #20060
```
  6415ac9e
- Fix conflicts in app/finders/issuable_finder.rb and spec/models/user_spec.rb · 5b94a7da
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5b94a7da
- Fix conflict in app/views/admin/application_settings/_form.html.haml · 4048249b
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4048249b
- Add more tests to ee-only app settings · d8e544a6
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d8e544a6
- Move EE-only application settings to expandable blocks · f527373d
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f527373d
- Merge branch 'ide-pending-tab' into 'master' · eaed588b
  Tim Zallmann authored Apr 04, 2018
```
Added pending tabs to IDE

See merge request gitlab-org/gitlab-ce!17936
```
  eaed588b
- Remove unused form for admin application settings · 88b999db
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  88b999db
- Merge branch '20394-protected-branches-wildcard' into 'master' · 1f59aa24
  Rémy Coutable authored Apr 04, 2018
```
Resolve "Protected branches count is wrong when a wildcard includes several protected branches"

Closes #20394

See merge request gitlab-org/gitlab-ce!17920
```
  1f59aa24
- Resolve "Protected branches count is wrong when a wildcard includes several protected branches" · c2823a4b
  Jan authored Apr 04, 2018
  
  c2823a4b
- Move the rest of application settings to expandable blocks · f11262b3
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f11262b3
- Merge branch 'update_code_quality_job' into 'master' · 6587a0cd
  Rémy Coutable authored Apr 04, 2018
```
Use standard codequality job

See merge request gitlab-org/gitlab-ce!18070
```
  6587a0cd
- Use standard codequality job · 81aba67e
  Olivier Gonzalez authored Apr 04, 2018
  
  81aba67e
- Merge branch '39880-merge-method-api' into 'master' · 9c728799
  Rémy Coutable authored Apr 04, 2018
```
Resolve "Allow the configuration of a project's merge method via the API"

Closes #39880

See merge request gitlab-org/gitlab-ce!18031
```
  9c728799
- Resolve "Allow the configuration of a project's merge method via the API" · f6d58310
  Jan authored Apr 04, 2018
  
  f6d58310