Commits · 74949838af96994bb1d75c5c2a8b5e04412dc793 · nexedi / gitlab-ce

16 Jun, 2017 23 commits
- Fix failing specs in spec/requests/api/runner_spec.rb · 74949838
  Nick Thomas authored Jun 16, 2017
  
  74949838
- Fix a rubocop failure in spec/requests/api/jobs_spec.rb · 8b58092f
  Nick Thomas authored Jun 16, 2017
  
  8b58092f
- Disable Migration/Timestamps and Migration/Datetime cops on preexisting EE migrations · 93e86da1
  Nick Thomas authored Jun 16, 2017
  
  93e86da1
- Fix conflicts in specs · 249e6bcf
  Nick Thomas authored Jun 16, 2017
  
  249e6bcf
- Fix conflicts in app/views/shared/issuable/form/_merge_params.html.haml · 460f60fa
  Nick Thomas authored Jun 16, 2017
  
  460f60fa
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-15 · 0ab753fa
  Nick Thomas authored Jun 16, 2017
  
  0ab753fa
- Fix conficts in docs · 58aafaf7
  Nick Thomas authored Jun 16, 2017
  
  58aafaf7
- Fix conflicts in specs · cdde09ea
  Nick Thomas authored Jun 16, 2017
  
  cdde09ea
- Fix one more scss conflict · 656f0413
  Nick Thomas authored Jun 16, 2017
  
  656f0413
- Fix conflict in spec/support/kubernetes_helpers.rb · ad7146f8
  Nick Thomas authored Jun 16, 2017
  
  ad7146f8
- Merge branch 'backport-merge_params-conflict-message-to-ee-master' into 'master' · 62a80669
  Sean McGivern authored Jun 16, 2017
```
Backport merge_params.html.haml conflict comment

See merge request !2120
```
  62a80669
- Fix conflicts in config/, db/ and rubocop/ · f9ac118e
  Nick Thomas authored Jun 16, 2017
  
  f9ac118e
- Resolve view conflicts · 5a24657e
  Nick Thomas authored Jun 16, 2017
  
  5a24657e
- Resolve service conflicts · f7939bdc
  Nick Thomas authored Jun 16, 2017
  
  f7939bdc
- Resolve conflicts in models · e599bb79
  Nick Thomas authored Jun 16, 2017
  
  e599bb79
- Resolve SCSS conflicts · 277cada2
  Nick Thomas authored Jun 16, 2017
  
  277cada2
- Merge branch '33149-rename-more-builds-ee' into 'master' · 1501d7c9
  Kamil Trzciński authored Jun 16, 2017
```
EE: Fix raw_path with the new job path, rename builds to jobs in test

See merge request !2129
```
  1501d7c9
- Merge branch 'backport-ee-cache-invalidation-to-ce-ee' into 'master' · 2cce73a2
  Rémy Coutable authored Jun 16, 2017
```
EE: Use the same way to invalidate cache from EE

See merge request !2134
```
  2cce73a2
- Update CHANGELOG.md for 9.2.6 · 12f573aa
  Timothy Andrew authored Jun 16, 2017
```
[ci skip]
```
  12f573aa
- Update CHANGELOG-EE.md for 9.2.6-ee · 847420dc
  Timothy Andrew authored Jun 16, 2017
```
[ci skip]
```
  847420dc
- Merge branch 'EE_benefit_qualification' into 'master' · 4f70aef3
  Achilleas Pipinellis authored Jun 16, 2017
```
Adding Benefit and Qualification sections to EE products

See merge request !2110
```
  4f70aef3
- Merge branch 'fix-filtered-search-weight-spec-with-author-assignee-tokens' into 'master' · c2727604
  Clement Ho authored Jun 16, 2017
```
Fix transient error with filtered search lazy author/assignee tokens

Closes #2661

See merge request !2142
```
  c2727604
- Fix transient error with filtered search lazy author/assignee tokens · 8eadfeb2
  Eric Eastwood authored Jun 15, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2661
```
  8eadfeb2
15 Jun, 2017 17 commits
- changed capitalization of headers · b3ff9d56
  Chad Malchow authored Jun 15, 2017
  
  b3ff9d56
- added in the headers of Why You Need This and Who Needs this · c4454563
  Chad Malchow authored Jun 15, 2017
  
  c4454563
- Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-06-15 · b6feafe4
  Nick Thomas authored Jun 15, 2017
  
  b6feafe4
- Merge branch 'ce-to-ee' into 'master' · 43a570dc
  Rémy Coutable authored Jun 15, 2017
```
CE Upstream - Monday

Closes omnibus-gitlab#1714, gitlab-ce#32587, and gitlab-ce#32218

See merge request !2107
```
  43a570dc
- Merge branch 'docs-registry-hostname-part-of-service-hostname' into 'master' · 75d425e4
  Rémy Coutable authored Jun 15, 2017
```
Service hostname also include registry name, when using non Docker Hub registry.

See merge request !11729
```
  75d425e4
- Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master' · 8f9bb212
  Annabel Dunstone Gray authored Jun 15, 2017
```
Fix file diff title and renames alignment in discussions

Closes #31782

See merge request !12169
```
  8f9bb212
- Merge branch 'deprecate-gitaly-path' into 'master' · 0b408219
  Sean McGivern authored Jun 15, 2017
```
Stop using deprecated `path` field on Gitaly messages

See merge request !12112
```
  0b408219
- Merge branch '13336-multiple-broadcast-messages' into 'master' · 051b8dc4
  Rémy Coutable authored Jun 15, 2017
```
#13336 - display multiple messages in both the UI and git output

Closes #13336

See merge request !11113
```
  051b8dc4
- #13336 - display multiple messages in both the UI and git output · 03b2ac65
  Mike Ricketts authored Jun 15, 2017
  
  03b2ac65
- Merge remote-tracking branch 'ee-com/master' into ce-to-ee · 35997518
  Dmitriy Zaporozhets authored Jun 15, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  35997518
- We're doing the same for CE and EE now · 99976567
  Lin Jen-Shin authored Jun 15, 2017
  
  99976567
- Merge branch '2001-related-issues-fe-base' into 'master' · 6656d92a
  Jacob Schatz authored Jun 15, 2017
```
Related issues FE Base

Closes #2001

See merge request !1797
```
  6656d92a
- Merge branch 'docs/gb/document-new-migrations-testing-technique' into 'master' · 039c3753
  Rémy Coutable authored Jun 15, 2017
```
Document a new migrations testing technique

Closes #33565

See merge request !12181
```
  039c3753
- Merge branch '23998-blame-age-map' into 'master' · 4be80bcc
  Annabel Dunstone Gray authored Jun 15, 2017
```
Add age color mapping to blame view

Closes #23998

See merge request !7198
```
  4be80bcc
- Fix object_store_uploader_spec.rb · e1e618ac
  Kamil Trzcinski authored Jun 15, 2017
  
  e1e618ac
- Remove a duplicate method in ObjectStoreUploader · 232acbc0
  Nick Thomas authored Jun 15, 2017
  
  232acbc0
- Document a new migrations testing technique · 347ec38c
  Grzegorz Bizon authored Jun 15, 2017
  
  347ec38c