Commits · a621c8d0ea6891456605245fed014996538abed5 · nexedi / gitlab-ce

17 Oct, 2018 26 commits
- Merge branch 'fj-52406-wiki-file-content-disposition' into 'master' · a621c8d0
  Douwe Maan authored Oct 17, 2018
```
Fixed bug with the content disposition with wiki attachments

See merge request gitlab-org/gitlab-ce!22220
```
  a621c8d0
- Fixed bug with the content disposition with wiki attachments · b8cf360e
  Francisco Javier López authored Oct 17, 2018
  
  b8cf360e
- Merge branch 'severity-and-priority-rounding-rules-docs' into 'master' · 11152ddf
  Douwe Maan authored Oct 17, 2018
```
Round P/S labels up, not down

See merge request gitlab-org/gitlab-ce!22424
```
  11152ddf
- Round P/S labels up, not down · dfe428f5
  Nick Thomas authored Oct 17, 2018
  
  dfe428f5
- Merge branch 'patch-28' into 'master' · 6faaa317
  Mike Lewis authored Oct 17, 2018
```
add link to concurrent devops

See merge request gitlab-org/gitlab-ce!22071
```
  6faaa317
- further instance statistics edits · c93582a1
  Mike Lewis authored Oct 17, 2018
  
  c93582a1
- Merge branch '44361-remove-gitlab-grit' into 'master' · 1696a3e8
  Rémy Coutable authored Oct 17, 2018
```
Remove gitlab-grit as a transitive dependency of GitLab

Closes #44361

See merge request gitlab-org/gitlab-ce!22373
```
  1696a3e8
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 071b39a2
  GitLab Release Tools Bot authored Oct 17, 2018
  
  071b39a2
- Merge branch 'extend-create-spec-with-label' into 'master' · 4919d779
  Rémy Coutable authored Oct 17, 2018
```
Extend Create New Merge Request test to also add a label

Closes gitlab-qa#233

See merge request gitlab-org/gitlab-ce!19228
```
  4919d779
- Extend Create New Merge Request test to also add a label · a68b6315
  Aleksandr Soborov authored Oct 17, 2018
  
  a68b6315
- Merge branch 'gt-update-environments-empty-state' into 'master' · d32ac958
  Filipa Lacerda authored Oct 17, 2018
```
Update environments empty state

See merge request gitlab-org/gitlab-ce!22297
```
  d32ac958
- Merge branch 'add/git-protocol-v2-docs' into 'master' · 639df4a1
  Evan Read authored Oct 17, 2018
```
Add Git protocol v2 docs

See merge request gitlab-org/gitlab-ce!22227
```
  639df4a1
- Add Git protocol v2 docs · a8b940fa
  James Lopez authored Oct 17, 2018
  
  a8b940fa
- Update CHANGELOG.md for 11.3.6 · 667c7f91
  GitLab Release Tools Bot authored Oct 17, 2018
```
[ci skip]
```
  667c7f91
- Update environments empty state · ea75b727
  George Tsiolis authored Oct 11, 2018
  
  ea75b727
- Merge branch 'winh-refactor-job-groups' into 'master' · da1a2bd6
  Phil Hughes authored Oct 17, 2018
```
Replace job with group in frontend components to be consistent with backend

See merge request gitlab-org/gitlab-ce!22387
```
  da1a2bd6
- Replace job with group in frontend components to be consistent with backend · b01dacff
  Winnie Hellmann authored Oct 17, 2018
  
  b01dacff
- Merge branch 'issue_49936' into 'master' · b2da681f
  Marcia Ramos authored Oct 17, 2018
```
Allow JIRA to login using email and API token

Closes #49936

See merge request gitlab-org/gitlab-ce!21726
```
  b2da681f
- Allow JIRA to login using email and API token · 918bd1e7
  Felipe Artur authored Oct 17, 2018
  
  918bd1e7
- Merge branch 'sh-sh-add-nfs-details-docs' into 'master' · 9fa23d40
  Marcia Ramos authored Oct 17, 2018
```
Add documentation on using NFS v4.1 and disabling server delegations

See merge request gitlab-org/gitlab-ce!22379
```
  9fa23d40
- Merge branch '50904-job-log' into 'master' · 5bb7067a
  Phil Hughes authored Oct 17, 2018
```
Resolve "Integrate new vue+vuex code base with new API and remove old haml code"

Closes #50904

See merge request gitlab-org/gitlab-ce!22116
```
  5bb7067a
- Resolve "Integrate new vue+vuex code base with new API and remove old haml code" · 5ed91cf8
  Filipa Lacerda authored Oct 17, 2018
  
  5ed91cf8
- Merge branch '37727-fix-file-delete-redirect' into 'master' · 712f41e1
  Rémy Coutable authored Oct 17, 2018
```
Resolve "In web editor, when delete a file, should navigate to enclosing directory"

Closes #37727

See merge request gitlab-org/gitlab-ce!21465
```
  712f41e1
- Resolve "In web editor, when delete a file, should navigate to enclosing directory" · 4a372af8
  George Thomas authored Oct 17, 2018
  
  4a372af8
- Merge branch '51712-new-line-before-expect' into 'master' · 9642a472
  Mike Greiling authored Oct 17, 2018
```
3. enable jasmine/new-line-before-expect

See merge request gitlab-org/gitlab-ce!22234
```
  9642a472
- enable jasmine/new-line-before-expect · 6f5723a1
  Johann Hubert Sonntagbauer authored Oct 09, 2018
  
  6f5723a1
16 Oct, 2018 14 commits
- Merge branch 'prettify-all-the-things-8' into 'master' · 28d412e5
  Fatih Acet authored Oct 16, 2018
```
Prettify all the things (part 8)

See merge request gitlab-org/gitlab-ce!22258
```
  28d412e5
- Merge branch 'prettify-all-the-things-1' into 'master' · 10cc335c
  Fatih Acet authored Oct 16, 2018
```
Prettify all the things (part 1)

See merge request gitlab-org/gitlab-ce!22248
```
  10cc335c
- Merge branch '49740-share-frontend-configs-between-repos' into 'master' · 68eafa50
  Clement Ho authored Oct 16, 2018
```
Resolve "Share frontend configs between repos"

Closes #49740

See merge request gitlab-org/gitlab-ce!22405
```
  68eafa50
- Merge branch '51712-no-promise-without-done-fail' into 'master' · 7b37794a
  Mike Greiling authored Oct 16, 2018
```
2. enable jasmine/no-promise-without-done-fail

See merge request gitlab-org/gitlab-ce!22231
```
  7b37794a
- Use @gitlab/eslint-config as base in eslintrc · a001069f
  Mike Greiling authored Oct 16, 2018
  
  a001069f
- Add documentation on using NFS v4.1 and disabling server delegations · 4d15fc40
  Stan Hu authored Oct 15, 2018
```
For more info, see:

* https://gitlab.com/gitlab-org/gitaly/issues/1339
* https://gitlab.com/gitlab-org/gitlab-ce/issues/52017
```
  4d15fc40
- enable jasmine/no-promise-without-done-fail · 0fd203ba
  Johann Hubert Sonntagbauer authored Oct 09, 2018
  
  0fd203ba
- Merge branch 'fix-review-link-docs' into 'master' · d87e88a6
  Douwe Maan authored Oct 16, 2018
```
Fix "ready for review" link

See merge request gitlab-org/gitlab-ce!22393
```
  d87e88a6
- Merge branch 'sh-fix-commit-signatures-error' into 'master' · 69c7d48e
  Douwe Maan authored Oct 16, 2018
```
Fix commit signature error when project is disabled

Closes #50903

See merge request gitlab-org/gitlab-ce!22344
```
  69c7d48e
- Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into 'master' · 4f475b81
  Douwe Maan authored Oct 16, 2018
```
Resolve "Webhook Image URLs Rewritten Incorrectly in Issues"

Closes #52650

See merge request gitlab-org/gitlab-ce!22361
```
  4f475b81
- Merge branch 'prettify-all-the-things-6' into 'master' · 1dfecf3e
  Fatih Acet authored Oct 16, 2018
```
Prettify all the things (part 6)

See merge request gitlab-org/gitlab-ce!22256
```
  1dfecf3e
- Prettify additional modules (I through Z) · c559bcca
  Mike Greiling authored Oct 10, 2018
  
  c559bcca
- Merge branch '52147-loading-state' into 'master' · 3e3f8ac8
  Mike Greiling authored Oct 16, 2018
```
Fixes styling issues in test reports

Closes #51386 and #52147

See merge request gitlab-org/gitlab-ce!22204
```
  3e3f8ac8
- Merge branch '52686-project-slug-does-not-auto-populate-in-ie11' into 'master' · 1dae485c
  Mike Greiling authored Oct 16, 2018
```
Resolve "Project slug does not auto populate in IE11"

Closes #52686

See merge request gitlab-org/gitlab-ce!22367
```
  1dae485c