Commits · c113b70057339609c5be02689a6ea0fdd51a19fc · nexedi / gitlab-ce

28 Mar, 2018 4 commits

Merge branch 'dm-refs-contains-sha-encoding' into 'master' · c113b700

Sean McGivern authored Mar 28, 2018

Fix listing commit branch/tags that contain special characters

Closes #43212

See merge request gitlab-org/gitlab-ce!18023

c113b700

Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master' · 63923301

Douwe Maan authored Mar 28, 2018

Update asciidoctor to 1.5.6.2 and asciidoctor-plantuml to 0.0.8

Closes #44712

See merge request gitlab-org/gitlab-ce!18022

63923301

Merge branch '43603-ci-lint-support' into 'master' · 51d92fb5

Kamil Trzciński authored Mar 28, 2018

Resolve "/ci/lint should support include keyword in config file"

Closes #43603

See merge request gitlab-org/gitlab-ce!17729

51d92fb5

Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master' · 949d1b37
Kamil Trzciński authored Mar 28, 2018
```
LFS direct upload port to CE

Closes #44548

See merge request gitlab-org/gitlab-ce!17752
```
949d1b37

27 Mar, 2018 36 commits
- Merge branch 'prettify-monitoring-code' into 'master' · 092445a4
  Clement Ho authored Mar 27, 2018
```
Clean up monitoring components

See merge request gitlab-org/gitlab-ce!18030
```
  092445a4
- Clean up monitoring components · b95c1850
  Mike Greiling authored Mar 27, 2018
  
  b95c1850
- Merge branch 'update-unresolved-discussions-vue-component' into 'master' · d3520573
  Clement Ho authored Mar 27, 2018
```
Add i18n and update specs for ShaMismatch vue component

See merge request gitlab-org/gitlab-ce!17870
```
  d3520573
- Merge branch '38167-ui-bug-when-creating-new-branch' into 'master' · 38c11bf8
  Clement Ho authored Mar 27, 2018
```
[FIX] Fixed bug in dropdown selector when selecting the same selection again

Closes #38167 and #37893

See merge request gitlab-org/gitlab-ce!14631
```
  38c11bf8
- [FIX] Fixed bug in dropdown selector when selecting the same selection again · a3035888
  bitsapien authored Mar 27, 2018
  
  a3035888
- Merge branch 'docs-fixes-prometheus-metrics-codeblocks' into 'master' · c02089af
  Achilleas Pipinellis authored Mar 27, 2018
```
Docs: improve readability of Prometheus metrics

See merge request gitlab-org/gitlab-ce!18028
```
  c02089af
- Add i18n and update specs for ShaMismatch vue component · 39e92fd8
  George Tsiolis authored Mar 19, 2018
  
  39e92fd8
- Merge branch 'docs/add-ci-trace-to-settings-and-configs' into 'master' · db555cb7
  Achilleas Pipinellis authored Mar 27, 2018
```
Add CI job trace default location to docs

See merge request gitlab-org/gitlab-ce!16894
```
  db555cb7
- replaces table with list items and code block for readability · f4004e6c
  Marcia Ramos authored Mar 27, 2018
  
  f4004e6c
- Add info on CI job traces for admins · d16e1fe5
  Achilleas Pipinellis authored Mar 27, 2018
  
  d16e1fe5
- Fix listing commit branch/tags that contain special characters · 39c911ea
  Douwe Maan authored Mar 27, 2018
  
  39c911ea
- Update asciidoctor-plantuml to 0.0.8 · a03105f8
  Takuya Noguchi authored Mar 28, 2018
  
  a03105f8
- Update asciidoctor to 1.5.6.2 · ee845e48
  Takuya Noguchi authored Mar 28, 2018
  
  ee845e48
- Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master' · e37b1c76
  Douwe Maan authored Mar 27, 2018
```
Fix N+1 in `MergeRequest#merge_request_diff_for`

See merge request gitlab-org/gitlab-ce!17908
```
  e37b1c76
- Merge branch 'remove-source-branch-docs' into 'master' · 1e307c8b
  Achilleas Pipinellis authored Mar 27, 2018
```
Added docs for removing source branch

See merge request gitlab-org/gitlab-ce!17879
```
  1e307c8b
- Added docs for removing source branch · 6effa6f9
  Phil Hughes authored Mar 27, 2018
  
  6effa6f9
- Merge branch 'docs-ee-5105-split_dependency_scanning_from_sast' into 'master' · b897357b
  Achilleas Pipinellis authored Mar 27, 2018
```
Add documentation for Dependency Scanning feature

See merge request gitlab-org/gitlab-ce!17893
```
  b897357b
- Add documentation for Dependency Scanning feature · 25b46820
  Olivier Gonzalez authored Mar 27, 2018
  
  25b46820
- Merge branch 'docs-ci-docker-build-cache' into 'master' · 9ce6169a
  Achilleas Pipinellis authored Mar 27, 2018
```
Add Docker layer caching to CI docker-in-docker docs

See merge request gitlab-org/gitlab-ce!17741
```
  9ce6169a
- Add Docker layer caching to CI docker-in-docker docs · 0f208071
  Athar Hameed authored Mar 27, 2018
  
  0f208071
- Merge branch 'jej/add-protected-branch-policy' into 'master' · 96b355dc
  Nick Thomas authored Mar 27, 2018
```
Add protected branch policy

See merge request gitlab-org/gitlab-ce!17982
```
  96b355dc
- Merge branch 'ab-44467-remove-index' into 'master' · fbb727db
  Yorick Peterse authored Mar 27, 2018
```
Remove unused index from events table.

Closes #44467

See merge request gitlab-org/gitlab-ce!18014
```
  fbb727db
- Merge branch 'update-docs-mr-template' into 'master' · 8bce2399
  Marcia Ramos authored Mar 27, 2018
```
Update the Documentation MR template

See merge request gitlab-org/gitlab-ce!18011
```
  8bce2399
- Merge branch 'ide-ui-theme' into 'master' · 94bfbe8a
  Tim Zallmann authored Mar 27, 2018
```
Added web IDE to GitLab theme definition

Closes #44571

See merge request gitlab-org/gitlab-ce!17963
```
  94bfbe8a
- Merge branch 'sh-add-fsevents-dev-dependency' into 'master' · 7c626d2d
  Mike Greiling authored Mar 27, 2018
```
Add fsevents as an optional dependency to avoid Webpack killing the CPU

Closes #33886

See merge request gitlab-org/gitlab-ce!17971
```
  7c626d2d
- Merge branch 'contribute/issues-merge-requests-dashboard-choice' into 'master' · eaf4ff09
  Douwe Maan authored Mar 27, 2018
```
'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices

Closes #42180

See merge request gitlab-org/gitlab-ce!17860
```
  eaf4ff09
- 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices · 2308ab7a
  Elias Werberich authored Mar 27, 2018
  
  2308ab7a
- Update CHANGELOG.md for 10.6.1 · 463fe406
  Filipa Lacerda authored Mar 27, 2018
```
[ci skip]
```
  463fe406
- Merge branch 'workhorse-gitaly-mandatory' into 'master' · dcfe8950
  Sean McGivern authored Mar 27, 2018
```
Make all workhorse gitaly calls opt-out

See merge request gitlab-org/gitlab-ce!18002
```
  dcfe8950
- Make all workhorse gitaly calls opt-out · f432fb9a
  Jacob Vosmaer (GitLab) authored Mar 27, 2018
  
  f432fb9a
- Merge branch 'patch-28' into 'master' · 1d7ca033
  Sean McGivern authored Mar 27, 2018
```
Fixed typos

See merge request gitlab-org/gitlab-ce!18012
```
  1d7ca033
- Remove unused index from events table. · f208411b
  Andreas Brandl authored Mar 27, 2018
```
Closes #44467.
```
  f208411b
- Merge branch 'test-hook-logs-xss' into 'master' · 01c4f565
  Douwe Maan authored Mar 27, 2018
```
Add a test to make sure there's no XSS for hook logs

See merge request gitlab-org/gitlab-ce!18005
```
  01c4f565
- Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master' · 678af224
  Douwe Maan authored Mar 27, 2018
```
Resolve "Add support for omniauth-jwt provider"

Closes #43512

See merge request gitlab-org/gitlab-ce!17774
```
  678af224
- Fixed typos · cfaedaec
  Pascal Borreli authored Mar 27, 2018
  
  cfaedaec
- Port LFS direct_upload from EE · 04c5e637
  Alessio Caiazza authored Mar 23, 2018
  
  04c5e637