Commits · 877096dbf773a0ae69180890f240701f94ac394c · nexedi / gitlab-ce

16 Apr, 2018 1 commit
- add badges to ee/doc/readme · 877096db
  Marcia Ramos authored Apr 16, 2018
  
  877096db
04 Apr, 2018 10 commits
- Merge branch 'ee-39880-merge-method-api' into 'master' · 8ba33b5d
  Rémy Coutable authored Apr 04, 2018
```
Port of 39880-merge-method-api to EE

Closes gitlab-ce#39880

See merge request gitlab-org/gitlab-ee!5154
```
  8ba33b5d
- Merge branch 'ce-to-ee-2018-04-04' into 'master' · fba1f9dc
  Marin Jankovski authored Apr 04, 2018
```
CE upstream - 2018-04-04 00:24 UTC

See merge request gitlab-org/gitlab-ee!5219
```
  fba1f9dc
- Merge branch 'ee-dz-improve-app-settings-5' into 'master' · 9b64995d
  Filipa Lacerda authored Apr 04, 2018
```
Redesign application settings to match project settings (part 5)

See merge request gitlab-org/gitlab-ee!5214
```
  9b64995d
- Merge branch 'blackst0ne-rails5-rename-sort-methods-ee' into 'master' · 97545f05
  Sean McGivern authored Apr 04, 2018
```
[Rails5] Rename `sort` methods to `sort_by_attribute`

See merge request gitlab-org/gitlab-ee!5207
```
  97545f05
- [Rails5] Rename `sort` methods to `sort_by_attribute` · 2cba6111
  blackst0ne authored Apr 04, 2018
  
  2cba6111
- Merge branch 'ee-fj-174-better-ldap-connection-handling' into 'master' · b4db84a5
  Douwe Maan authored Apr 04, 2018
```
CE port: Add better LDAP connection handling

Closes #480 and #4941

See merge request gitlab-org/gitlab-ee!5173
```
  b4db84a5
- CE port: Add better LDAP connection handling · 4e2245ae
  Francisco Javier López authored Apr 04, 2018
  
  4e2245ae
- Move network related app settings to expandable blocks · 52b36d61
  Dmitriy Zaporozhets authored Apr 03, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  52b36d61
- Merge branch 'ee-dz-improve-app-settings-4' into 'master' · 2657fe84
  Grzegorz Bizon authored Apr 04, 2018
```
Redesign application settings to match project settings (part 4)

See merge request gitlab-org/gitlab-ee!5184
```
  2657fe84
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-04 · 835e46d0
  GitLab Bot authored Apr 04, 2018
  
  835e46d0
03 Apr, 2018 29 commits
- Merge branch 'ce-to-ee-2018-04-03' into 'master' · 3aa499a7
  Robert Speicher authored Apr 03, 2018
```
CE upstream - 2018-04-03 21:26 UTC

See merge request gitlab-org/gitlab-ee!5218
```
  3aa499a7
- Merge branch '5547-backport-gitlab-git-checksum-to-ce' into 'master' · 0bf38d35
  Stan Hu authored Apr 03, 2018
```
Move Gitlab::Git::Checksum outside the ee top folder.

See merge request gitlab-org/gitlab-ee!5215
```
  0bf38d35
- Merge branch '5547-backport-gitlab-git-checksum-to-ce' into 'master' · a08f15c6
  Stan Hu authored Apr 03, 2018
```
Backport Gitlab::Git::Checksum to CE

See merge request gitlab-org/gitlab-ce!18161
```
  a08f15c6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-03 · e281aeb7
  GitLab Bot authored Apr 03, 2018
  
  e281aeb7
- Merge branch 'ce-to-ee-2018-04-03' into 'master' · c1aca58b
  Robert Speicher authored Apr 03, 2018
```
CE upstream - 2018-04-03 18:27 UTC

See merge request gitlab-org/gitlab-ee!5216
```
  c1aca58b
- Merge branch 'docs-update_security_products_examples' into 'master' · 6c5bd6d0
  Marcia Ramos authored Apr 03, 2018
```
Update Security Products examples documentation

See merge request gitlab-org/gitlab-ce!18151
```
  6c5bd6d0
- Update Security Products examples documentation · a0869452
  Olivier Gonzalez authored Apr 03, 2018
  
  a0869452
- Merge branch 'docs-update_security_products_examples-ee' into 'master' · 4470dcc8
  Philippe Lafoucrière authored Apr 03, 2018
```
Update Security Products examples documentation

See merge request gitlab-org/gitlab-ee!5210
```
  4470dcc8
- Resolve conflict in spec/controllers/projects/issues_controller_spec.rb · 21487749
  Robert Speicher authored Apr 03, 2018
  
  21487749
- Backport Gitlab::Git::Checksum to CE · 563d38e8
  Douglas Barbosa Alexandre authored Apr 03, 2018
  
  563d38e8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-03 · 5e9a30bb
  GitLab Bot authored Apr 03, 2018
```
# Conflicts:
#	spec/controllers/projects/issues_controller_spec.rb

[ci skip]
```
  5e9a30bb
- Move Gitlab::Git::Checksum to gitlab/git · 19906962
  Douglas Barbosa Alexandre authored Apr 03, 2018
  
  19906962
- Merge branch '43745-store-metadata-checksum-for-artifacts' into 'master' · 59a15895
  Kamil Trzciński authored Apr 03, 2018
```
Store sha256 checksum of Metadata in `ci_job_artifacts` table

See merge request gitlab-org/gitlab-ce!18149
```
  59a15895
- Merge branch '44902-remove-rake-test-ci' into 'master' · cdc7d5a6
  Robert Speicher authored Apr 03, 2018
```
Remove Rake test_ci task

Closes #44902

See merge request gitlab-org/gitlab-ce!18139
```
  cdc7d5a6
- Merge branch 'zj-bump-gitaly' into 'master' · 20986535
  Sean McGivern authored Apr 03, 2018
```
Upgrade Gitaly server verion

See merge request gitlab-org/gitlab-ce!18147
```
  20986535
- Merge branch 'docs-add-qa-step-to-database-mr-template' into 'master' · 047caa8c
  Yorick Peterse authored Apr 03, 2018
```
Update the 'Database Changes' MR template to add a step for QA

See merge request gitlab-org/gitlab-ce!16670
```
  047caa8c
- Add changelog · b92b481b
  Shinya Maeda authored Apr 04, 2018
  
  b92b481b
- Merge branch... · fb55b271
  Rémy Coutable authored Apr 03, 2018
```
Merge branch '44254-codequality-jobs-are-failing-silently-with-an-empty-codeclimate-json-file' into 'master'

Resolve "codequality jobs are failing silently with an empty codeclimate.json file"

Closes #44254

See merge request gitlab-org/gitlab-ce!18152
```
  fb55b271
- Merge branch 'jprovazn-comment-thread' into 'master' · b406d63a
  Fatih Acet authored Apr 03, 2018
```
Refactor discussions/notes code

Closes #42148

See merge request gitlab-org/gitlab-ce!17926
```
  b406d63a
- Refactor discussions/notes code · 65664c2e
  Jan Provaznik authored Apr 03, 2018
  
  65664c2e
- Merge branch 'ee-jprovazn-comment-thread' into 'master' · 4787644f
  Fatih Acet authored Apr 03, 2018
```
[EE] Epic comment thread

Closes gitlab-ce#42148

See merge request gitlab-org/gitlab-ee!4997
```
  4787644f
- [EE] Epic comment thread · 4b1d1a7e
  Jan Provaznik authored Apr 03, 2018
  
  4b1d1a7e
- Merge branch '44425-use-gitlab_environment' into 'master' · 67ca10f3
  Douwe Maan authored Apr 03, 2018
```
Resolve "Disabling two factor authentication via gitlab-rake fails"

Closes #44425

See merge request gitlab-org/gitlab-ce!18154
```
  67ca10f3
- Merge branch 'ce-to-ee-2018-04-03' into 'master' · d0a8a2db
  Achilleas Pipinellis authored Apr 03, 2018
```
CE upstream - 2018-04-03 12:31 UTC

See merge request gitlab-org/gitlab-ee!5209
```
  d0a8a2db
- Merge branch 'blackst0ne-rails5-update-bin-rspec' into 'master' · 4131c39a
  Rémy Coutable authored Apr 03, 2018
```
[Rails5] Allow using `RAILS5` env with rspec

See merge request gitlab-org/gitlab-ce!18140
```
  4131c39a
- Merge branch '44861-mark-gitaly-nplus-one-again' into 'master' · e3e461fb
  Rémy Coutable authored Apr 03, 2018
```
Re-enable allowing n+1 Gitaly for branches index

Closes #44861

See merge request gitlab-org/gitlab-ce!18131
```
  e3e461fb
- Merge branch 'fix/qa/gb/use-project-path-in-package-and-qa-action-ee' into 'master' · 0498450a
  Rémy Coutable authored Apr 03, 2018
```
Use project path in package-and-qa to fetch script

See merge request gitlab-org/gitlab-ee!5204
```
  0498450a
- Use gitlab_environment because we need: · b3723fe2
  Lin Jen-Shin authored Apr 03, 2018
```
* ask_to_continue
* Gitlab::TaskAbortedByUserError
```
  b3723fe2
- Merge branch 'fix/qa/gb/use-project-path-in-package-and-qa-action' into 'master' · 83b2e703
  Rémy Coutable authored Apr 03, 2018
```
Use project path in package-and-qa to fetch script

See merge request gitlab-org/gitlab-ce!18145
```
  83b2e703