Commits · a30358881c420da686301c51c4e6c5135969d8b9 · Boxiang Sun / gitlab-ce

27 Mar, 2018 34 commits
- [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
- 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
- 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
- Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'master' · ffa73498
  Kamil Trzciński authored Mar 27, 2018
```
Port to CE: Resolve "Multiple clusters: incorrect cluster details injected - environment scope is ignored"

See merge request gitlab-org/gitlab-ce!17904
```
  ffa73498
- Merge branch '40781-os-to-ce' into 'master' · 835fe4d3
  Sean McGivern authored Mar 27, 2018
```
Bring Object Storage to CE

Closes #4171, #4163, #3370, #2841, and #29203

See merge request gitlab-org/gitlab-ce!17358
```
  835fe4d3
- Clarify what auth_url should be · 775796cd
  Achilleas Pipinellis authored Mar 26, 2018
```
[ci skip]
```
  775796cd
- Merge branch 'fix/ldap_wihtout_user' into 'master' · ab8f13c3
  Douwe Maan authored Mar 27, 2018
```
Fix LDAP login without user in DB

See merge request gitlab-org/gitlab-ce!17988
```
  ab8f13c3
- Update the Documentation MR template · 729d1554
  Achilleas Pipinellis authored Mar 27, 2018
```
[ci skip]
```
  729d1554
- Fix LDAP login without user in DB · 7d017926
  Horatiu Eugen Vlad authored Mar 26, 2018
  
  7d017926
- Merge branch 'docs/add-test-for-readmes' into 'master' · 0efbcc6c
  Sean McGivern authored Mar 27, 2018
```
Add test for new README.md in docs

Closes #44647

See merge request gitlab-org/gitlab-ce!17991
```
  0efbcc6c
26 Mar, 2018 6 commits
- Re-arrange deployment_platform to avoid cop complainments · 1a79beff
  Mayra Cabrera authored Mar 26, 2018
  
  1a79beff
- Merge branch 'dz-improve-app-settings' into 'master' · 7c02d0cf
  Filipa Lacerda authored Mar 26, 2018
```
Redesign application settings to match project settings (part 1)

See merge request gitlab-org/gitlab-ce!17937
```
  7c02d0cf
- Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master' · c66d25b9
  Kamil Trzciński authored Mar 26, 2018
```
Improve how we populate pipeline with stages and builds

Closes #43941

See merge request gitlab-org/gitlab-ce!17841
```
  c66d25b9
- Put forms from expandable sections into fieldset to ensure proper animation · 7cc870f3
  Dmitriy Zaporozhets authored Mar 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7cc870f3
- Add a test to make sure there's no XSS for hook logs · 09ce4671
  Lin Jen-Shin authored Mar 27, 2018
  
  09ce4671
- Remove gray background from app setting expandable sections · aa19ca43
  Dmitriy Zaporozhets authored Mar 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aa19ca43