Commits · 6856da431c193cff18a2d4e1b6a33f3502e0443e · nexedi / gitlab-ce

03 Jul, 2017 28 commits
- Merge branch 'ce-to-ee' into 'master' · 6856da43
  Sean McGivern authored Jul 03, 2017
```
CE Upstream - Monday

See merge request !2325
```
  6856da43
- Merge branch 'docs/overview-features-2-ee' into 'master' · 3e14e718
  Achilleas Pipinellis authored Jul 03, 2017
```
Add overview and use-cases for Issue Boards EE-only features

See merge request !2296
```
  3e14e718
- Job's review · 19e0b84f
  Marcia Ramos authored Jul 03, 2017
  
  19e0b84f
- typo · 437f6e40
  Marcia Ramos authored Jul 03, 2017
  
  437f6e40
- fix link, notes > note · d26300c2
  Marcia Ramos authored Jul 03, 2017
  
  d26300c2
- copyedit · 2593da64
  Marcia Ramos authored Jul 03, 2017
  
  2593da64
- Merge branch '2525-ee-kubernetes' into 'master' · 061b2714
  Kamil Trzciński authored Jul 03, 2017
```
Move some EE-only KubernetesService code to a prepended module

Closes #2525

See merge request !2168
```
  061b2714
- Fix issuable finder and helper conflicts · 5982811e
  Sean McGivern authored Jul 03, 2017
  
  5982811e
- resolve `app/views/projects/issues/_nav_btns.html.haml` · d75ddcf2
  Phil Hughes authored Jul 03, 2017
```
resolve `spec/helpers/groups_helper_spec.rb`
```
  d75ddcf2
- Resolve conflict in spec/services/git_push_service_spec.rb · f2fdd528
  Dmitriy Zaporozhets authored Jul 03, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f2fdd528
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 4f51a1e5
  Dmitriy Zaporozhets authored Jul 03, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4f51a1e5
- Merge branch 'ce-to-ee-2017-06-30' into 'master' · 8aaa2a00
  Dmitriy Zaporozhets authored Jul 03, 2017
```
CE upstream: Friday

Closes #225, gitaly#201, and gitlab-ce#33172

See merge request !2313
```
  8aaa2a00
- Merge branch 'patch-24' into 'master' · c8eef2d2
  Rémy Coutable authored Jul 03, 2017
```
Fixed typo in gitlab_flow.md

See merge request !12561
```
  c8eef2d2
- Merge branch '23036-replace-dashboard-new-project-spinach' into 'master' · d1109bd6
  Rémy Coutable authored Jul 03, 2017
```
Replaces 'dashboard/new-project.feature' spinach with rspec

See merge request !12550
```
  d1109bd6
- Merge branch '34609-fix-lazy-create-milestone-in-spec' into 'master' · 86afc2e3
  Sean McGivern authored Jul 03, 2017
```
Eagerly create a milestone that is used in a feature spec

Closes #34609

See merge request !12604
```
  86afc2e3
- Merge branch 'docs-fix-branch-api-examples' into 'master' · 959289d0
  Rémy Coutable authored Jul 03, 2017
```
Fix curl example paths (missing the 'files' segment)

See merge request !12588
```
  959289d0
- Merge branch '34116-milestone-filtering-on-group-issues' into 'master' · 063b035d
  Sean McGivern authored Jul 03, 2017
```
Use correct milestones for filtering on Group Issues

Closes #34116

See merge request !12374
```
  063b035d
- Eagerly create a milestone that is used in a feature spec · 92702772
  Rémy Coutable authored Jul 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  92702772
- Don't resolve fork relationships for projects pending delete · dd69efa8
  Nick Thomas authored Jul 03, 2017
  
  dd69efa8
- Merge branch 'dz-improve-codeclimate-json-cleanup' into 'master' · 2443ab69
  Kamil Trzciński authored Jul 03, 2017
```
Remove unnecessary pull command from codeclimate job

See merge request !12583
```
  2443ab69
- Merge branch 'improve-mirroring-documentation-and-force-update-button-transparency' into 'master' · 27a22281
  Grzegorz Bizon authored Jul 03, 2017
```
Improves mirror force update button transparency

See merge request !2299
```
  27a22281
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-30 · a8153625
  Nick Thomas authored Jul 03, 2017
  
  a8153625
- Merge branch 'adjust-readme-repo-width' into 'master' · 332fd782
  Phil Hughes authored Jul 03, 2017
```
Adjust readme repo width

See merge request !12585
```
  332fd782
- Adjust readme repo width · 59f49bbf
  Dimitrie Hoekstra authored Jul 03, 2017
  
  59f49bbf
- Merge branch '34525-backport-update-go-to-91-92-guide' into 'master' · 8bb00c44
  Sean McGivern authored Jul 03, 2017
```
Make clear that Go 1.8 is required since GitLab 9.2

Closes #34525

See merge request !12564
```
  8bb00c44
- Merge branch 'fix-performance_bar-specs' into 'master' · 973e6a7f
  Sean McGivern authored Jul 03, 2017
```
Fix performance bar specs

See merge request !12225
```
  973e6a7f
- Merge branch... · 4eb6b7c1
  Phil Hughes authored Jul 03, 2017
```
Merge branch '34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails' into 'master'

Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails"

Closes #34097

See merge request !12430
```
  4eb6b7c1
- Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" · a080aa13
  Luke "Jared" Bennett authored Jul 03, 2017
  
  a080aa13
02 Jul, 2017 4 commits
- Merge branch 'set-sidebar-height' into 'master' · b071317c
  Tim Zallmann authored Jul 02, 2017
```
Make issuable sidebar setSidebarHeight more efficient

See merge request !12252
```
  b071317c
- Merge branch 'change-extended-docker-configuration-syntax' into 'master' · 954e743b
  Grzegorz Bizon authored Jul 02, 2017
```
Make entrypoint and command keys to be array of strings

See merge request !12536
```
  954e743b
- Fix rubocop offenses · 16ff3229
  Tomasz Maczukin authored Jun 30, 2017
  
  16ff3229
- Make entrypoint and command keys to be array of strings · dcdf2a8b
  Tomasz Maczukin authored Jun 28, 2017
  
  dcdf2a8b
01 Jul, 2017 1 commit
- copyedit, add image · c1df2514
  Marcia Ramos authored Jun 30, 2017
  
  c1df2514
30 Jun, 2017 7 commits
- Merge branch 'enable-webpack-code-splitting' into 'master' · e48f54b5
  Jacob Schatz authored Jun 30, 2017
```
Enable webpack code splitting

Closes #32989

See merge request !12032
```
  e48f54b5
- Merge branch 'fix-assigned-issuable-lists' into 'master' · 30c7fef0
  Annabel Dunstone Gray authored Jun 30, 2017
```
Add issuable-list class to shared mr/issue lists to fix new responsive layout

See merge request !12591
```
  30c7fef0
- Merge branch 'winh-issue-show-aftereach' into 'master' · 8513072e
  Clement Ho authored Jun 30, 2017
```
Remove empty afterEach() from issue_show app_spec.js

See merge request !12577
```
  8513072e
- Merge branch 'restore-timeago-translation' into 'master' · a704f9e5
  Phil Hughes authored Jun 30, 2017
```
Restore timeago translations in renderTimeago.

See merge request !12590
```
  a704f9e5
- Merge branch 'ee-experimental-breadcrumbs' into 'master' · 87a822e6
  Annabel Dunstone Gray authored Jun 30, 2017
```
Port of experimental-breadcrumbs to EE

See merge request !2314
```
  87a822e6
- Add issuable-list class to shared mr/issue lists to fix new responsive layout · 8fd0887f
  tauriedavis authored Jun 30, 2017
  
  8fd0887f
- Merge branch 'experimental-breadcrumbs' into 'master' · a9847ede
  Annabel Dunstone Gray authored Jun 30, 2017
```
New navigation breadcrumbs

Closes #34029

See merge request !12346
```
  a9847ede