Commits · 8b3ba1899ae9e09b64f4a7c48d65a7a4853ead59 · nexedi / gitlab-ce

11 Oct, 2017 38 commits
- Merge branch 'replace_explore_projects.feature' into 'master' · 8b3ba189
  Rémy Coutable authored Oct 11, 2017
```
Replace the 'features/explore/projects.feature' spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!14755
```
  8b3ba189
- Merge branch '37660-match-sidebar-colors' into 'master' · 1621b456
  Annabel Dunstone Gray authored Oct 11, 2017
```
37660 Change background color of nav sidebar to match other gl sidebars

Closes #37660

See merge request gitlab-org/gitlab-ce!14800
```
  1621b456
- Merge branch 'ph-gl-form-js-modules' into 'master' · efeaf3bd
  Filipa Lacerda authored Oct 11, 2017
```
Moves form related JS modules out of global

See merge request gitlab-org/gitlab-ce!14780
```
  efeaf3bd
- Merge branch 'backport-ee-change-for-test' into 'master' · e39aef73
  Rémy Coutable authored Oct 11, 2017
```
Backport EE change for setting up forked project

See merge request gitlab-org/gitlab-ce!14817
```
  e39aef73
- Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master' · a6d09bc6
  Douwe Maan authored Oct 11, 2017
```
Pass git object dir attributes as relative paths to Gitaly

Closes gitaly#629

See merge request gitlab-org/gitlab-ce!14713
```
  a6d09bc6
- Merge branch 'winh-i18n-inclusive-language-docs' into 'master' · 119a3b34
  Achilleas Pipinellis authored Oct 11, 2017
```
Add inclusive language to translation guidelines

See merge request gitlab-org/gitlab-ce!14815
```
  119a3b34
- Merge branch 'docs-patch-28' into 'master' · 644d24cd
  Achilleas Pipinellis authored Oct 11, 2017
```
Update image commenting MR link in docs

See merge request gitlab-org/gitlab-ce!14816
```
  644d24cd
- Backport EE change for setting up forked project · b0ba1581
  Lin Jen-Shin authored Oct 11, 2017
  
  b0ba1581
- Update image commenting MR link · f6d3da55
  Clement Ho authored Oct 11, 2017
  
  f6d3da55
- Add inclusive language to translation guidelines · d1714356
  Winnie Hellmann authored Oct 11, 2017
  
  d1714356
- Pass git object dir attributes as relative paths to Gitaly · 4378f56c
  Ahmad Sherif authored Oct 05, 2017
```
Fixes gitaly#629
```
  4378f56c
- Merge branch 'rs-mysql-groups-dashboard-failure' into 'master' · 5a2acfe0
  Douwe Maan authored Oct 11, 2017
```
Fix a feature spec failing only on MySQL

Closes #39003

See merge request gitlab-org/gitlab-ce!14811
```
  5a2acfe0
- Merge branch 'move_markdown_preview_to_concern' into 'master' · 90f95f2b
  Sean McGivern authored Oct 11, 2017
```
Add support for markdown preview to group milestones

Closes #30241

See merge request gitlab-org/gitlab-ce!14806
```
  90f95f2b
- Fix a feature spec failing only on MySQL · be3facd9
  Robert Speicher authored Oct 11, 2017
  
  be3facd9
- Merge branch '35580-cannot-import-project-with-milestones' into 'master' · 565a2d73
  Sean McGivern authored Oct 11, 2017
```
fix the import :milestone from adding the group_id

Closes #35580

See merge request gitlab-org/gitlab-ce!14657
```
  565a2d73
- Merge branch 'gitaly-has-local-branches' into 'master' · 143ace07
  Rémy Coutable authored Oct 11, 2017
```
Use Gitaly's RepositoryService.HasLocalBranches RPC

See merge request gitlab-org/gitlab-ce!14753
```
  143ace07
- Merge branch '38720-sort-admin-runners' into 'master' · 22ade6e7
  Rémy Coutable authored Oct 11, 2017
```
Add sort runners on admin runners

Closes #38720

See merge request gitlab-org/gitlab-ce!14661
```
  22ade6e7
- Merge branch 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-under' into 'master' · 1faa97b2
  Kamil Trzciński authored Oct 11, 2017
```
Move callback route(`google_api/auth/callback`) for Oauth under `-`

Closes #38911

See merge request gitlab-org/gitlab-ce!14802
```
  1faa97b2
- Merge branch '37399-simplify-project-page' into 'master' · a11077e9
  Phil Hughes authored Oct 11, 2017
```
Simplify project page

Closes #37399 and #38839

See merge request gitlab-org/gitlab-ce!14669
```
  a11077e9
- Simplify project page · bd024830
  Annabel Dunstone Gray authored Oct 11, 2017
  
  bd024830
- Add support for markdown preview to group milestones · 64bb1906
  Vitaliy @blackst0ne Klachkov authored Oct 11, 2017
  
  64bb1906
- Merge branch 'milestones-permissions-docs' into 'master' · 14b4444d
  Sean McGivern authored Oct 11, 2017
```
Developer can create/edit/delete milestones

See merge request gitlab-org/gitlab-ce!14797
```
  14b4444d
- Developer can create/edit/delete milestones · ca9279d4
  Victor Wu authored Oct 11, 2017
  
  ca9279d4
- Merge branch 'rc-change-qa-namespace' into 'master' · 01903274
  Grzegorz Bizon authored Oct 11, 2017
```
QA group name, use hyphens rather than underscores

See merge request gitlab-org/gitlab-ce!14786
```
  01903274
- Merge branch '38869-start' into 'master' · 57d331d7
  Phil Hughes authored Oct 11, 2017
```
Enable eslint in star and remove from main.js

See merge request gitlab-org/gitlab-ce!14795
```
  57d331d7
- Enable eslint in star and remove from main.js · 696ffac0
  Filipa Lacerda authored Oct 11, 2017
  
  696ffac0
- Merge branch '38869-labels' into 'master' · a6b33275
  Phil Hughes authored Oct 11, 2017
```
Use ES6 modules in labels and labels manager

See merge request gitlab-org/gitlab-ce!14794
```
  a6b33275
- spec fixes · 556ef5ed
  Phil Hughes authored Oct 10, 2017
  
  556ef5ed
- Moves form related JS modules out of global · 44d3745e
  Phil Hughes authored Oct 10, 2017
  
  44d3745e
- Remove unnecessary TOLLEVEL routes from path_regex.rb · 1f14e9c2
  Shinya Maeda authored Oct 11, 2017
  
  1f14e9c2
- Add - before google_api/auth/callback · 4f47fe6a
  Shinya Maeda authored Oct 11, 2017
  
  4f47fe6a
- Merge branch 'docs-image-discussion' into 'master' · a30417e5
  Achilleas Pipinellis authored Oct 11, 2017
```
Add image discussion docs

Closes #38879

See merge request gitlab-org/gitlab-ce!14743
```
  a30417e5
- Add image discussion docs · 694fec5c
  Clement Ho authored Oct 11, 2017
  
  694fec5c
- Merge branch 'rc/refactor-testing-docs' into 'master' · c734bd01
  Achilleas Pipinellis authored Oct 11, 2017
```
Refactor the Development documentation, and divide the Testing documentation into multiple pages

See merge request gitlab-org/gitlab-ce!14512
```
  c734bd01
- Refactor the Development documentation, and divide the Testing documentation into multiple pages · 676840ff
  Rémy Coutable authored Oct 11, 2017
  
  676840ff
- Merge branch '38828-update-kubernetes-helm-chart-docs' into 'master' · 150f58de
  Achilleas Pipinellis authored Oct 11, 2017
```
Update Kubernetes Helm chart docs

Closes #38828

See merge request gitlab-org/gitlab-ce!14717
```
  150f58de
- Update Kubernetes Helm chart docs · e7a0c6b3
  Joshua Lambert authored Oct 11, 2017
  
  e7a0c6b3
- Replace the 'features/explore/projects.feature' spinach test with an rspec analog · bd69b794
  Vitaliy @blackst0ne Klachkov authored Oct 11, 2017
  
  bd69b794
10 Oct, 2017 2 commits
- 37660 Change background color of nav sidebar to match other gl sidebars · fa68cb3c
  tauriedavis authored Oct 10, 2017
  
  fa68cb3c
- Merge branch 'add-resolve-discussion-test' into 'master' · 73488a9b
  Filipa Lacerda authored Oct 10, 2017
```
Add explicit test to test resolved discussion toggle content

See merge request gitlab-org/gitlab-ce!14796
```
  73488a9b