Commits · 721bc0c474a565425a1035effae953b36eff079b · nexedi / gitlab-ce

30 Aug, 2017 1 commit

Douwe Maan authored Aug 30, 2017

Merge branch '3233-project-mirror-not-actually-active-when-new-project-is-created-fix' into 'master'

Fixes activation of project mirror when project is created.

Closes #3233

See merge request !2756

721bc0c4

29 Aug, 2017 9 commits
- Merge branch '3280-fix-feature-available-check-when-license-table-does-not-exist' into 'master' · f0deea60
  Stan Hu authored Aug 29, 2017
```
Check if `licenses` table exists before loading the current license.

Closes #3280

See merge request !2783
```
  f0deea60
- Simplify License#load_license method · af040ec7
  Douglas Barbosa Alexandre authored Aug 29, 2017
  
  af040ec7
- Add CHANGELOG · b7c943aa
  Douglas Barbosa Alexandre authored Aug 29, 2017
  
  b7c943aa
- Fix License.feature_available? when license table does not exist · 39918c3b
  Douglas Barbosa Alexandre authored Aug 29, 2017
  
  39918c3b
- Merge branch 'convdev-index-ee-compat' into 'master' · 981835bf
  Phil Hughes authored Aug 29, 2017
```
Move ConvDev index to Overview from Monitoring (EE Compatible Version)

See merge request !2732
```
  981835bf
- Move ConvDev index to Overview from Monitoring. · 0efdf53b
  Bryce Johnson authored Aug 18, 2017
  
  0efdf53b
- Fixes activation of project mirror when project is created. · 0011b83e
  Tiago Botelho authored Aug 24, 2017
  
  0011b83e
- Merge branch 'feature/sm/2783-rename-codeclimate-to-codequality' into 'master' · 965d87a2
  Kamil Trzciński authored Aug 29, 2017
```
Support `codequality` job name for Code Quality feature

Closes #2783

See merge request !2704
```
  965d87a2
- Merge branch 'ee-37069-remove-li' into 'master' · 043f96eb
  Phil Hughes authored Aug 29, 2017
```
Remove unnecessary divider

See merge request !2771
```
  043f96eb
28 Aug, 2017 19 commits
- Remove unnecessary divider · 801902ca
  Annabel Dunstone Gray authored Aug 25, 2017
  
  801902ca
- Update CHANGELOG.md for 9.5.2 · e1f31849
  Jose Ivan Vargas authored Aug 28, 2017
```
[ci skip]
```
  e1f31849
- Update CHANGELOG-EE.md for 9.5.2-ee · b0b86446
  Jose Ivan Vargas authored Aug 28, 2017
```
[ci skip]
```
  b0b86446
- Fix doc · d4358566
  Shinya Maeda authored Aug 29, 2017
  
  d4358566
- Fix doc · 2c98b42e
  Shinya Maeda authored Aug 25, 2017
  
  2c98b42e
- Add tests · 80b94298
  Shinya Maeda authored Aug 22, 2017
  
  80b94298
- Update .gitlab-ci.yml · ba076a68
  Shinya Maeda authored Aug 22, 2017
  
  ba076a68
- Update build.rb · 80d731de
  Shinya Maeda authored Aug 18, 2017
  
  80d731de
- Add changelog · b8fb119c
  Shinya Maeda authored Aug 17, 2017
  
  b8fb119c
- ini · b80a0450
  Shinya Maeda authored Aug 17, 2017
  
  b80a0450
- Merge branch '3267-fix-repo-mirroring-docs' into 'master' · 55f63361
  Achilleas Pipinellis authored Aug 28, 2017
```
SSH pull repository mirroring was introduced in 9.5, not 9.15

Closes #3267

See merge request !2775
```
  55f63361
- Merge branch 'mk-sync-ldap-external-groups-on-login' into 'master' · 3201a490
  Douwe Maan authored Aug 28, 2017
```
Sync ldap external groups on login

Closes #2468

See merge request !2720
```
  3201a490
- Merge branch 'master-i18n' into 'master' · be329e94
  Douwe Maan authored Aug 28, 2017
```
New Crowdin translations

See merge request !2743
```
  be329e94
- Merge branch 'rs-remove-filtered-issues-skips-ee' into 'master' · fb9cf1e7
  Douwe Maan authored Aug 28, 2017
```
Remove skipped examples in filtered issues weight feature spec

See merge request !2773
```
  fb9cf1e7
- SSH pull repository mirroring was introduced in 9.5, not 9.15 · 97cabbdb
  Nick Thomas authored Aug 28, 2017
  
  97cabbdb
- Merge branch 'tweak-jira-int-doc' into 'master' · 3d348cff
  Sean McGivern authored Aug 28, 2017
```
Removed reference use case article.  The article documents using Jira Smart…

See merge request !2755
```
  3d348cff
- Merge branch 'rs-flaky-ldap-access-spec' into 'master' · 7cd8cc21
  Sean McGivern authored Aug 28, 2017
```
Prevent transient Gitlab::LDAP::Access spec failure

See merge request !2770
```
  7cd8cc21
- Merge branch 'ce-to-ee' into 'master' · c0261f77
  Dmitriy Zaporozhets authored Aug 28, 2017
```
CE Upstream

Closes gitlab-com/gitlab-docs#121

See merge request !2774
```
  c0261f77
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · c83d0973
  Dmitriy Zaporozhets authored Aug 28, 2017
  
  c83d0973
27 Aug, 2017 1 commit
- Merge branch 'sh-system-hooks-ldap-users' into 'master' · ef8eb3f6
  Grzegorz Bizon authored Aug 27, 2017
```
Fire system hooks when a user is created via LDAP or OAuth

Closes #37073

See merge request !13846
```
  ef8eb3f6
26 Aug, 2017 3 commits
- Merge branch 'ce-to-ee-2017-08-25' into 'master' · 8e3e1d43
  Dmitriy Zaporozhets authored Aug 26, 2017
```
CE upstream: Friday

Closes gitlab-ce#36919

See merge request !2765
```
  8e3e1d43
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2017-08-25 · f615a063
  Dmitriy Zaporozhets authored Aug 26, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f615a063
- Fire system hooks when a user is created via LDAP or OAuth · e94a2fde
  Stan Hu authored Aug 25, 2017
```
Closes #37073
```
  e94a2fde
25 Aug, 2017 7 commits
- Merge branch 'sh-disable-log-cursor-specs-mysql' into 'master' · 42953363
  Robert Speicher authored Aug 25, 2017
```
Limit Geo LogCursor spec to run only on PostgreSQL

See merge request !2772
```
  42953363
- Remove skipped examples in filtered issues weight feature spec · 7150ca7f
  Robert Speicher authored Aug 25, 2017
  
  7150ca7f
- Limit Geo LogCursor spec to run only on PostgreSQL · 0cc74325
  Stan Hu authored Aug 25, 2017
  
  0cc74325
- Merge branch 'duplicated-admin-sidebar' into 'master' · ff3d2578
  Clement Ho authored Aug 25, 2017
```
Remove duplicated items from admin sidebar

Closes #3260

See merge request !2769
```
  ff3d2578
- Remove duplicated items from admin sidebar · 02c75b2e
  Annabel Dunstone Gray authored Aug 25, 2017
  
  02c75b2e
- Merge branch 'fix-repo-scrollbar' into 'master' · 2be34630
  Jacob Schatz authored Aug 25, 2017
```
Fix repo editor scrollbar

Closes #37020

See merge request !13823
```
  2be34630
- Merge branch '36828-create-a-common-docker-documentation-resource-docs' into 'master' · fee93c1a
  Marcia Ramos authored Aug 25, 2017
```
Common Docker Documentation Location in `gitlab-ce`

Closes #36828

See merge request !13749
```
  fee93c1a