Commits · 1b67593be185f97d9bee83b9d1a9784562228da8 · nexedi / gitlab-ce

02 Apr, 2018 38 commits
- Merge branch 'ee-dz-type-button' into 'master' · 1b67593b
  Filipa Lacerda authored Apr 02, 2018
```
Add button type to settings toggle

See merge request gitlab-org/gitlab-ee!5200
```
  1b67593b
- Merge branch 'ck-nfs-ha-setup-docs' into 'master' · 5d7bbac9
  Drew Blessing authored Apr 02, 2018
```
Add setup instructions for setting up NFS in a typical GitLab HA cluster.

See merge request gitlab-org/gitlab-ee!4824
```
  5d7bbac9
- Add button type to settings toggle · cf7ec415
  Dmitriy Zaporozhets authored Apr 02, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cf7ec415
- Merge branch 'master' into 'master' · 2e3b48cf
  Marcia Ramos authored Apr 02, 2018
```
On needs quotes in Laravel ci Example

See merge request gitlab-org/gitlab-ee!5192
```
  2e3b48cf
- Merge branch 'docs/mirrored-repositories-for-pipelines' into 'master' · 40e25bcd
  Marcia Ramos authored Apr 02, 2018
```
Provide clarification on mirrored repositories for pipelines

Closes gitlab-ce#39929

See merge request gitlab-org/gitlab-ee!5125
```
  40e25bcd
- Merge branch 'docs/lfs-s3' into 'master' · 68191130
  Marcia Ramos authored Apr 02, 2018
```
Refactor the LFS S3 docs

Closes #3517

See merge request gitlab-org/gitlab-ee!5075
```
  68191130
- Merge branch 'ee-fl-prettier-mock-data' into 'master' · 80ed7758
  Clement Ho authored Apr 02, 2018
```
Prettify mock data files - EE port

See merge request gitlab-org/gitlab-ee!5195
```
  80ed7758
- Merge branch '5023-add-system-header-and-footer' into 'master' · 086052d3
  Douwe Maan authored Apr 02, 2018
```
Resolve "Add system header and footer"

Closes #5023

See merge request gitlab-org/gitlab-ee!4972
```
  086052d3
- Merge branch 'ce-to-ee-2018-04-02' into 'master' · 47f94d9a
  Dmitriy Zaporozhets authored Apr 02, 2018
```
CE upstream - 2018-04-02 12:25 UTC

See merge request gitlab-org/gitlab-ee!5196
```
  47f94d9a
- Resolve conflicts in doc/ci/variables/README.md · f6a5dfbd
  Dmitriy Zaporozhets authored Apr 02, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f6a5dfbd
- Resolve conflicts in app/models/ci/build.rb · a25da8b2
  Dmitriy Zaporozhets authored Apr 02, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a25da8b2
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-02 · f4dd12eb
  GitLab Bot authored Apr 02, 2018
```
# Conflicts:
#	app/models/ci/build.rb
#	doc/ci/variables/README.md

[ci skip]
```
  f4dd12eb
- Merge branch 'blackst0ne-bump-html-pipeline-gem' into 'master' · 055a02ed
  Sean McGivern authored Apr 02, 2018
```
Bump html-pipeline to 2.7.1

Closes #24039

See merge request gitlab-org/gitlab-ce!18132
```
  055a02ed
- Bump html-pipeline to 2.7.1 · b463b415
  blackst0ne authored Apr 02, 2018
  
  b463b415
- Merge branch 'ce-to-ee-2018-04-01' into 'master' · 16967419
  Lin Jen-Shin (🌙 04-04 ~ 04-08) authored Apr 02, 2018
```
CE upstream - 2018-04-01 15:25 UTC

See merge request gitlab-org/gitlab-ee!5191
```
  16967419
- Merge branch 'master' into ce-to-ee-2018-04-01 · dcfbd99a
  Kushal Pandya authored Apr 02, 2018
  
  dcfbd99a
- Merge branch 'docs-update-issue-mr-description-templates-api' into 'master' · 80ef79f2
  Sean McGivern authored Apr 02, 2018
```
Update docs for API for issue and merge request description templates

See merge request gitlab-org/gitlab-ce!18114
```
  80ef79f2
- Update docs for API for issue and merge request description templates · 972dd479
  Victor Wu authored Apr 02, 2018
  
  972dd479
- Fix for Conflict in api_spec.js · 0477a37c
  Tim Zallmann authored Apr 02, 2018
  
  0477a37c
- Merge branch 'dz-improve-app-settings-3' into 'master' · 377a2644
  Filipa Lacerda authored Apr 02, 2018
```
Redesign application settings to match project settings (part 3)

See merge request gitlab-org/gitlab-ce!18056
```
  377a2644
- Removes eslint disabled comments · 6736efc4
  Filipa Lacerda authored Apr 02, 2018
  
  6736efc4
- Merge branch '5068-roadmap-relayout' into 'master' · 3715a495
  Phil Hughes authored Apr 02, 2018
```
Roadmap markup relayout

Closes #5068 and #4848

See merge request gitlab-org/gitlab-ee!5020
```
  3715a495
- Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master' · 2aa6bf72
  Kamil Trzciński authored Apr 02, 2018
```
Pipeline variables expression in only/except configuration

Closes #37397

See merge request gitlab-org/gitlab-ce!17316
```
  2aa6bf72
- Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master' · 45c009b8
  Kamil Trzciński authored Apr 02, 2018
```
Resolve "Usage ping for Kubernetes integration"

Closes #44291

See merge request gitlab-org/gitlab-ce!17922
```
  45c009b8
- Merge branch 'feature/gb/variables-expressions-in-only-except-ee' into 'master' · e8ce2068
  Kamil Trzciński authored Apr 02, 2018
```
Implement pipeline variables expressions / EE version

See merge request gitlab-org/gitlab-ee!5127
```
  e8ce2068
- Add changelog entry · be7901fb
  Kushal Pandya authored Apr 02, 2018
  
  be7901fb
- Update styles for new rendering implementation · 253b5d56
  Kushal Pandya authored Apr 02, 2018
  
  253b5d56
- Update indicator bar height to ensure it moves past bottom edge · 9b4db6cd
  Kushal Pandya authored Apr 02, 2018
  
  9b4db6cd
- Update template, cleanup methods · 571b56cf
  Kushal Pandya authored Apr 02, 2018
  
  571b56cf
- Update template, move shared code to SectionMixin · 30dfe711
  Kushal Pandya authored Apr 02, 2018
  
  30dfe711
- Update template, add scroll handler · 5e8d48d8
  Kushal Pandya authored Apr 02, 2018
  
  5e8d48d8
- Update template, add mixin, cleanup methods for new template · 7975af2f
  Kushal Pandya authored Apr 02, 2018
  
  7975af2f
- Update template, add itemWidth, cleanup methods · 7339cf59
  Kushal Pandya authored Apr 02, 2018
  
  7339cf59
- Update template · e1513f8f
  Kushal Pandya authored Apr 02, 2018
  
  e1513f8f
- Update template, add itemWidth prop · e7f80ef5
  Kushal Pandya authored Apr 02, 2018
  
  e7f80ef5
- Shared code for Epics list and timeline sections · a25a8c93
  Kushal Pandya authored Apr 02, 2018
  
  a25a8c93
- Add mock values for updated layout · 2768fd26
  Kushal Pandya authored Apr 02, 2018
  
  2768fd26
- Update constants for relayout · 4f896ec1
  Kushal Pandya authored Apr 02, 2018
  
  4f896ec1
01 Apr, 2018 2 commits
- on needs quotes in Laravel ci Example · cba94100
  Logan Lindquist authored Apr 01, 2018
```
otherwise it throws an error

PHP Warning:  Use of undefined constant on - assumed 'on' (this will throw an Error in a future version of PHP)
```
  cba94100
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-01 · 436891da
  GitLab Bot authored Apr 01, 2018
```
# Conflicts:
#	spec/javascripts/api_spec.js

[ci skip]
```
  436891da