Commits · 38bc37e101cf6ca0c999746b0eee144072b44db8 · nexedi / gitlab-ce

21 Apr, 2017 11 commits
- Simplify service desk email address · 38bc37e1
  Felipe Artur authored Apr 18, 2017
```
Fix specs and email address regex
```
  38bc37e1
- Merge branch 'ee-31189-pipelines-error-state' into 'master' · 241753a8
  Phil Hughes authored Apr 21, 2017
```
Port of 31189-pipelines-error-state to EE

See merge request !1692
```
  241753a8
- Merge branch 'add-index-to-approvals-mr-id' into 'master' · e1d11d10
  Stan Hu authored Apr 21, 2017
```
Add index to approvals.merge_request_id

Closes #2229

See merge request !1695
```
  e1d11d10
- Add index to approvals.merge_request_id · 7a9051e9
  Sean McGivern authored Apr 21, 2017
  
  7a9051e9
- Merge branch 'canaries-first' into 'master' · 42f4481d
  Sean McGivern authored Apr 21, 2017
```
Show canaries first

Closes #2216

See merge request !1685
```
  42f4481d
- Show canaries first · dd568462
  Kamil Trzcinski authored Apr 20, 2017
  
  dd568462
- Merge branch 'feature/service-desk-project-admin' into 'master' · 17e57b8b
  Sean McGivern authored Apr 21, 2017
```
only require project admin for service desk

Closes #2137

See merge request !1662
```
  17e57b8b
- Guarantee only one state is shown at a time · dc457ea2
  Filipa Lacerda authored Apr 20, 2017
  
  dc457ea2
- Update CHANGELOG.md for 9.0.6 · 792e4ddb
  James Lopez authored Apr 21, 2017
```
[ci skip]
```
  792e4ddb
- Update CHANGELOG-EE.md for 9.0.6-ee · e2460122
  James Lopez authored Apr 21, 2017
```
[ci skip]
```
  e2460122
- Merge branch '1664-geo-improve-setup' into 'master' · b3288eec
  Achilleas Pipinellis authored Apr 21, 2017
```
Geo improved setup for 9.1

See merge request !1584
```
  b3288eec
20 Apr, 2017 29 commits
- Merge branch 'missed-request-to-imports' into 'master' · 5003d0b7
  Fatih Acet authored Apr 20, 2017
```
Corrected some missed some bare requires to imports

See merge request !1657
```
  5003d0b7
- Merge branch 'canary-deploys-docs' into 'master' · 04393d02
  Achilleas Pipinellis authored Apr 20, 2017
```
Update documentation with canary deploys

See merge request !1684
```
  04393d02
- Update documentation with canary deploys · d3fbe089
  Kamil Trzciński authored Apr 20, 2017
  
  d3fbe089
- Copyedit Geo docs · 5b2bceec
  Achilleas Pipinellis authored Apr 20, 2017
  
  5b2bceec
- Merge branch 'nt/ce-to-ee-thursday' into 'master' · 7c73aeb9
  Douwe Maan authored Apr 20, 2017
```
CE upstream: Thursday

Closes gitaly#174

See merge request !1683
```
  7c73aeb9
- Fix "Fix conflicts in filtered search" · 6f7be97e
  Nick Thomas authored Apr 20, 2017
  
  6f7be97e
- Fix some robocop failures caused by automatic merge · 6080ff90
  Nick Thomas authored Apr 20, 2017
  
  6080ff90
- Fix "Resolve search conflicts" · 83fcdf59
  Nick Thomas authored Apr 20, 2017
  
  83fcdf59
- Fix "Fix merge conflicts in usage ping" · 378358ff
  Nick Thomas authored Apr 20, 2017
  
  378358ff
- Fix "Resolve conflicts in user activity" · 353e43b4
  Nick Thomas authored Apr 20, 2017
  
  353e43b4
- Merge remote-tracking branch 'upstream/master' into nt/ce-to-ee-thursday · 409ed365
  Nick Thomas authored Apr 20, 2017
  
  409ed365
- Merge branch 'ee-27486-eslint-promises' into 'master' · 5d5d3d1c
  Filipa Lacerda authored Apr 20, 2017
```
Add ES lint support to identify poorly written Promises

See merge request !1682
```
  5d5d3d1c
- Add ES lint support to identify poorly written Promises · 8ca1551a
  Kushal Pandya authored Apr 20, 2017
  
  8ca1551a
- Resolve conflicts in user activity · 6aad7ca9
  Nick Thomas authored Apr 20, 2017
  
  6aad7ca9
- Remove a final conflict in db/schema.rb · fc57aab8
  Nick Thomas authored Apr 20, 2017
  
  fc57aab8
- Fix merge conflicts in usage ping · 5f9109e5
  Nick Thomas authored Apr 20, 2017
  
  5f9109e5
- Resolve other merge conflicts · ecd2a8e0
  Nick Thomas authored Apr 20, 2017
  
  ecd2a8e0
- Resolve search conflicts · 8e994806
  Nick Thomas authored Apr 20, 2017
  
  8e994806
- Fix conflicts in filtered search · 3c834a57
  Nick Thomas authored Apr 20, 2017
  
  3c834a57
- Merge remote-tracking branch 'ce/master' into nt/ce-to-ee-thursday · 15483879
  Nick Thomas authored Apr 20, 2017
  
  15483879
- Merge branch 'fix/29125-ee' into 'master' · ccbd665a
  Sean McGivern authored Apr 20, 2017
```
Display custom hook error messages when automatic merge is enabled

Closes gitlab-ce#29125

See merge request !1670
```
  ccbd665a
- Merge branch 'fix/29125' into 'master' · f96e1bf1
  Sean McGivern authored Apr 20, 2017
```
Port of fix/29125-ee to CE

Closes #29125

See merge request !10796
```
  f96e1bf1
- Merge branch 'mrchrisw-remove-services' into 'master' · 5ba1137c
  Achilleas Pipinellis authored Apr 20, 2017
```
Services=>Integrations

See merge request !1655
```
  5ba1137c
- Merge branch 'ce_upstream' into 'master' · 7b8f121e
  Nick Thomas authored Apr 20, 2017
```
CE upstream

Closes #2175, gitlab-ce#30810, gitlab-ce#27655, and gitlab-ce#30863

See merge request !1664
```
  7b8f121e
- Merge branch 'issuable-state-custom-links' into 'master' · b99853f5
  Sean McGivern authored Apr 20, 2017
```
Do not append issuable state to links with custom anchor

Closes #30916

See merge request !10782
```
  b99853f5
- Merge branch 'environments-vue-2' into 'master' · f09f7539
  Phil Hughes authored Apr 20, 2017
```
Refactor into .vue files part 2

See merge request !10791
```
  f09f7539
- Refactor into .vue files part 2 · 324aa141
  Filipa Lacerda authored Apr 20, 2017
  
  324aa141
- Merge branch 'plantuml-filter-after-highlight' into 'master' · 08b2e7cd
  Sean McGivern authored Apr 20, 2017
```
Fix PlantUML integration in GFM

Closes #30557

See merge request !10651
```
  08b2e7cd
- Merge branch '2204-contrib-analytics-highlight-sub-nav' into 'master' · a0823c87
  Alfredo Sumaran authored Apr 20, 2017
```
Highlight Contribution Analytics tab under groups when active, remove sub-nav items

Closes #2204

See merge request !1677
```
  a0823c87