Commits · 3461e5c1f9f3d7c9276708eebe749af2828fbb03 · nexedi / gitlab-ce

28 Jun, 2017 6 commits
- Allow stubbing application configuration despite prepended module · 3461e5c1
  Bob Van Landuyt authored Jun 27, 2017
  
  3461e5c1
- Merge branch 'sh-mark-geo-as-alpha' into 'master' · 50158604
  Achilleas Pipinellis authored Jun 28, 2017
```
Marked Geo as alpha

See merge request !2287
```
  50158604
- Update CHANGELOG.md for 9.3.2 · 377f34bf
  Clement Ho authored Jun 27, 2017
```
[ci skip]
```
  377f34bf
- Update CHANGELOG-EE.md for 9.3.2-ee · cfac303b
  Clement Ho authored Jun 27, 2017
```
[ci skip]
```
  cfac303b
- Merge remote-tracking branch 'dev/master' · b2c36bf9
  Clement Ho authored Jun 27, 2017
  
  b2c36bf9
- Marked Geo as alpha · 10fff30d
  Stan Hu authored Jun 27, 2017
```
[ci skip]
```
  10fff30d
27 Jun, 2017 34 commits
- Merge branch '2757-fix-elasticsearch-check' into 'master' · 7718377a
  Douwe Maan authored Jun 27, 2017
```
Fix GitLab check: Problem with Elastic Search

Closes #2757

See merge request !2278
```
  7718377a
- Merge branch '2425-fix-failure-for-mirrors-with-empty-repository' into 'master' · 39fa7478
  Douwe Maan authored Jun 27, 2017
```
Empty repository mirror no longer creates master branch with README automatically

Closes #2425

See merge request !2276
```
  39fa7478
- Merge branch 'bvl-burndown-chart-license-check' into 'master' · e9cb4e3a
  Douwe Maan authored Jun 27, 2017
```
Add License check for Burndown Charts

Closes #2578

See merge request !2219
```
  e9cb4e3a
- Add License check for Burndown Charts · 93653090
  Bob Van Landuyt authored Jun 27, 2017
  
  93653090
- Merge branch '2762-ldap-group-link-select-dropdown-error' into 'master' · 7f605d07
  Jacob Schatz authored Jun 27, 2017
```
Resolve "LDAP group link select dropdown error"

Closes #2762

See merge request !2277
```
  7f605d07
- Disable rainbow during SimpleExecutor specs to have consistence · 97db97f1
  Gabriel Mazetto authored Jun 27, 2017
  
  97db97f1
- Merge branch '2572-namespace-fast-forward-merge' into 'master' · 62d05c23
  Douwe Maan authored Jun 27, 2017
```
Namespace license checks for fast-forward merge (EES)

Closes #2572

See merge request !2272
```
  62d05c23
- Empty repository mirror no longer creates master branch with README automatically · c8abb527
  Tiago Botelho authored Jun 27, 2017
  
  c8abb527
- Merge branch 'ce_upstream' into 'master' · 3d5a4ce5
  Sean McGivern authored Jun 27, 2017
```
CE upstream

Closes omnibus-gitlab#2414 and gitlab-ce#33223

See merge request !2271
```
  3d5a4ce5
- Merge branch '33533-related-issues-ux-improvements' into 'master' · 6639a3cd
  Phil Hughes authored Jun 27, 2017
```
Related Issues UX improvements - loading

See merge request !2246
```
  6639a3cd
- Related Issues UX improvements - loading · ad21d826
  Eric Eastwood authored Jun 27, 2017
  
  ad21d826
- Merge branch 'fix-ee-project-logic-port-error' into 'master' · 0b86b67a
  Douwe Maan authored Jun 27, 2017
```
Fixes Project EE specific logic port error

See merge request !2251
```
  0b86b67a
- Add ldap_groups test to api_spec.js · 419de6a9
  Luke "Jared" Bennett authored Jun 27, 2017
  
  419de6a9
- Changelog · d9a48ea1
  Gabriel Mazetto authored Jun 27, 2017
  
  d9a48ea1
- Merge branch 'dm-migration-tag-ee' into 'master' · ec2fa2a1
  Rémy Coutable authored Jun 27, 2017
```
Update tag used by migration path builds for EE

See merge request !2263
```
  ec2fa2a1
- Fix api.js ldap_groups function to use Promise API rather than jq Deferred API · 90d679fb
  Luke "Jared" Bennett authored Jun 27, 2017
  
  90d679fb
- Fix elasticsearch check logic · 74660e2f
  Gabriel Mazetto authored Jun 27, 2017
  
  74660e2f
- Make the SimpleExecutor rescue exceptions in the executing Checks · d0698978
  Gabriel Mazetto authored Jun 27, 2017
  
  d0698978
- Namespace license checks for fast-forward merge (EES) · 7f9b7767
  Nick Thomas authored Jun 27, 2017
  
  7f9b7767
- Merge branch '2571-namespace-squash-and-merge' into 'master' · 842aebb9
  Douwe Maan authored Jun 27, 2017
```
Add namespace license checks for squash before merge (EES)

Closes #2571

See merge request !2249
```
  842aebb9
- Fix wrong resolvation · 751ee00e
  Valery Sizov authored Jun 27, 2017
  
  751ee00e
- [CE->EE] Resolve a last part of conflicts · 1845ce59
  Valery Sizov authored Jun 27, 2017
  
  1845ce59
- Resolve lib/gitlab/ldap/access.rb[ci skip] · 200fc04b
  Valery Sizov authored Jun 27, 2017
  
  200fc04b
- Merge branch 'docs/add-overview-features-1' into 'master' · c67c4fb1
  Achilleas Pipinellis authored Jun 27, 2017
```
Add overview and use-cases to EE features

See merge request !2236
```
  c67c4fb1
- [Resolve CE->EE] Resolve first part of the conflicts · dca545fc
  Valery Sizov authored Jun 27, 2017
  
  dca545fc
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci skip] · 3de86826
  Valery Sizov authored Jun 27, 2017
  
  3de86826
- Update repo mirroring docs · fbce27d1
  Achilleas Pipinellis authored Jun 27, 2017
  
  fbce27d1
- Update webhooks docs · 8bb39137
  Achilleas Pipinellis authored Jun 27, 2017
  
  8bb39137
- Update file locking docs · 658b8eb5
  Achilleas Pipinellis authored Jun 27, 2017
  
  658b8eb5
- Update Email from GitLab docs · 99b500f3
  Achilleas Pipinellis authored Jun 27, 2017
  
  99b500f3
- Merge branch 'zj-review-apps-usage-data' into 'master' · c00e5bfa
  Grzegorz Bizon authored Jun 27, 2017
```
Add review apps to usage ping

Closes #33171

See merge request !12185
```
  c00e5bfa
- Merge branch '34168-cannot-edit-prioritized-labels-issues-with-firefox' into 'master' · 89f7f98e
  Phil Hughes authored Jun 27, 2017
```
Action Buttons on Prio Labels working again by setting pointer events to none on…

Closes #34168

See merge request !12473
```
  89f7f98e
- Action Buttons on Prio Labels working again by setting pointer events to none on… · 3f167e48
  Tim Zallmann authored Jun 27, 2017
  
  3f167e48
- Merge branch '34324-gitlab-db-seed-is-broken' into 'master' · f4eef75d
  Rémy Coutable authored Jun 27, 2017
```
Resolve "GitLab DB seed is broken"

Closes #34324

See merge request !12464
```
  f4eef75d