Commits · bd22ebcb2034099ce863a3ea65b23ef114b4da74 · nexedi / gitlab-ce

29 Sep, 2017 6 commits
- Update CHANGELOG.md for 9.5.6 · bd22ebcb
  Jose Ivan Vargas authored Sep 29, 2017
```
[ci skip]
```
  bd22ebcb
- Update CHANGELOG-EE.md for 9.5.6-ee · 2f03af67
  Jose Ivan Vargas authored Sep 29, 2017
```
[ci skip]
```
  2f03af67
- Merge branch 'codeclimate-requests' into 'master' · 30818f47
  Phil Hughes authored Sep 29, 2017
```
Makes code quality requests in parallel

Closes #2910

See merge request gitlab-org/gitlab-ee!3033
```
  30818f47
- Makes code quality requests in parallel · 8f3fe6b1
  Filipa Lacerda authored Sep 29, 2017
  
  8f3fe6b1
- Merge branch 'ce-to-ee-2017-09-27' into 'master' · 9363a476
  Rémy Coutable authored Sep 29, 2017
```
CE upstream - Wednesday

Closes gitlab-ce#34415

See merge request gitlab-org/gitlab-ee!3026
```
  9363a476
- Add avatar_url to the Board public JSON shema · 738de26c
  Rémy Coutable authored Sep 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  738de26c
28 Sep, 2017 24 commits
- Merge branch 'ee-hashed-storage-migration-path' into 'master' · c49ad301
  Douwe Maan authored Sep 28, 2017
```
Hashed storage migration path (EE version)

Closes #3118

See merge request gitlab-org/gitlab-ee!3023
```
  c49ad301
- Merge branch 'ee-fix-translation-namespaces' into 'master' · f66aaa54
  Filipa Lacerda authored Sep 28, 2017
```
EE port of fix-translation-namespaces

See merge request gitlab-org/gitlab-ee!3011
```
  f66aaa54
- Document hashed storage recommendations for Geo · 72ab47df
  Nick Thomas authored Sep 27, 2017
  
  72ab47df
- Send a Geo repository renamed event when migrating to hashed storage · 3b0aedda
  Nick Thomas authored Sep 27, 2017
  
  3b0aedda
- Add support to migrate existing projects to Hashed Storage async · e96e3eb8
  Gabriel Mazetto authored Sep 06, 2017
  
  e96e3eb8
- Merge branch 'docs/group-issue-boards' into 'master' · 21525fc4
  Marcia Ramos authored Sep 28, 2017
```
Fix heading for group issue boards

See merge request gitlab-org/gitlab-ee!3028
```
  21525fc4
- removed conflict markers in GitLab.pot · ce3bacaf
  Phil Hughes authored Sep 28, 2017
  
  ce3bacaf
- Merge branch 'feature/ldap-group-filter' into 'master' · cca835c5
  Douwe Maan authored Sep 28, 2017
```
Enhance LDAP group mappings with filters

Closes #3188

See merge request gitlab-org/gitlab-ee!2885
```
  cca835c5
- Fix heading for group issue boards · 9bb886e6
  Achilleas Pipinellis authored Sep 28, 2017
  
  9bb886e6
- Fix specs for pipeline access validation chain · 7f9d234b
  Grzegorz Bizon authored Sep 28, 2017
  
  7f9d234b
- EE port of fix-translation-namespaces · 52788202
  Phil Hughes authored Sep 25, 2017
  
  52788202
- Merge branch 'master-i18n' into 'master' · e6da8b93
  Douwe Maan authored Sep 28, 2017
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!2947
```
  e6da8b93
- New Crowdin translations · 11d7071f
  GitLab Crowdin Bot authored Sep 28, 2017
  
  11d7071f
- Merge branch '38476-improve-merge-jid-cleanup-on-merge-process-ee' into 'master' · fc2f3692
  Sean McGivern authored Sep 28, 2017
```
[CE backport] Clean merge_jid whenever necessary on the merge process

See merge request gitlab-org/gitlab-ee!3027
```
  fc2f3692
- fix member list · 3c63b03d
  James Lopez authored Sep 28, 2017
  
  3c63b03d
- Merge branch 'feature/user-audit-2' into 'master' · 20aa6a60
  Grzegorz Bizon authored Sep 28, 2017
```
Add additional user actions in Audit events

Closes #1370

See merge request gitlab-org/gitlab-ee!2103
```
  20aa6a60
- Merge branch 'service-desk-permissions' into 'master' · f6b15131
  Phil Hughes authored Sep 28, 2017
```
Only show 'Turn on Service Desk' when permissions are present.

Closes #3509

See merge request gitlab-org/gitlab-ee!3020
```
  f6b15131
- Only show 'Turn on Service Desk' when permissions are present. · 040a77af
  Bryce Johnson authored Sep 28, 2017
  
  040a77af
- Merge branch '37494-group-tab-member-lock' into 'master' · 5566debe
  Phil Hughes authored Sep 28, 2017
```
Show group tab if member lock is enabled

Closes #3575

See merge request gitlab-org/gitlab-ee!3025
```
  5566debe
- refactor spec · a3ac178a
  James Lopez authored Sep 28, 2017
  
  a3ac178a
- update validation · 200b70f2
  James Lopez authored Sep 28, 2017
  
  200b70f2
- Resolve conflicts in create pipeline service · 7759bb28
  Grzegorz Bizon authored Sep 28, 2017
  
  7759bb28
- fix static analysis error · 40d46d13
  James Lopez authored Sep 28, 2017
  
  40d46d13
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-09-27 · 74c11b1c
  Rémy Coutable authored Sep 28, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  74c11b1c
27 Sep, 2017 10 commits
- Merge branch 'winh-full-height-boards-sidebar-ee' · 989ea86a
  Robert Speicher authored Sep 27, 2017
```
Make issue boards sidebar full height

See merge request !2968
```
  989ea86a
- Clean merge_jid whenever necessary on the merge process · f2937836
  Oswaldo Ferreira authored Sep 27, 2017
```
MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute. This way we can keep track if the MR is really "ongoing" or "stuck"
```
  f2937836
- add feature spec · 915ac40d
  James Lopez authored Sep 27, 2017
  
  915ac40d
- Resolve conflict in app/views/shared/boards/_show.html.haml · 68961480
  Winnie Hellmann authored Sep 27, 2017
  
  68961480
- Resolve kubernetes docs conflicts · 9c72f8fd
  Achilleas Pipinellis authored Sep 27, 2017
  
  9c72f8fd
- Resolve conflict in app/finders/issuable_finder.rb · 0a4de96e
  Rémy Coutable authored Sep 27, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0a4de96e
- Resolve conflict in app/assets/javascripts/boards/boards_bundle.js · c8899c55
  Rémy Coutable authored Sep 27, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c8899c55
- fix validation · cae9e9f7
  James Lopez authored Sep 27, 2017
  
  cae9e9f7
- Merge remote-tracking branch 'origin/feature/ldap-group-filter' into feature/ldap-group-filter · ab657be2
  James Lopez authored Sep 27, 2017
  
  ab657be2
- fix validation · 1adcbbb4
  James Lopez authored Sep 27, 2017
  
  1adcbbb4