Commits · 719e0dc39e8b333c51a7cf504ef736eb31c085cb · Léo-Paul Géneau / gitlab-ce

19 Jun, 2018 5 commits
- Merge branch 'rails5-fix-46276' into 'master' · 719e0dc3
  Rémy Coutable authored Jun 19, 2018
```
Rails5 fix format in uploads actions

Closes #46276

See merge request gitlab-org/gitlab-ce!19907
```
  719e0dc3
- Merge branch 'rs-soft-removed-objects-spec-parity' into 'master' · cc4bb691
  Rémy Coutable authored Jun 19, 2018
```
Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rb

See merge request gitlab-org/gitlab-ce!19966
```
  cc4bb691
- Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master' · 41d01281
  Rémy Coutable authored Jun 19, 2018
```
Extract EE specific files/lines for spec/lib/gitlab/ci

See merge request gitlab-org/gitlab-ce!19971
```
  41d01281
- Merge branch 'rails5-nil-formats' into 'master' · 0f18d489
  Rémy Coutable authored Jun 19, 2018
```
Fix nil formats test

Closes #47833

See merge request gitlab-org/gitlab-ce!19941
```
  0f18d489
- Merge branch 'docs/fix-yaml-indentation' into 'master' · 0716e192
  Achilleas Pipinellis authored Jun 19, 2018
```
Fix indentation in CI yaml

See merge request gitlab-org/gitlab-ce!19737
```
  0716e192
18 Jun, 2018 35 commits
- Merge branch 'jivl-fix-checkbox-top-margin' into 'master' · 02c007bd
  Annabel Gray authored Jun 18, 2018
```
Remove top margin from checkboxes in integrations page

See merge request gitlab-org/gitlab-ce!19976
```
  02c007bd
- Remove top margin from checkboxes in integrations page · dd95bf43
  Jose authored Jun 18, 2018
  
  dd95bf43
- Merge branch '48072-bs4-labels-in-issues-system-notes-are-misaligned-again' into 'master' · 7491a200
  Annabel Gray authored Jun 18, 2018
```
Resolve "BS4: Labels in issues system notes are misaligned again"

Closes #48072

See merge request gitlab-org/gitlab-ce!19972
```
  7491a200
- Resolve "BS4: Labels in issues system notes are misaligned again" · 14528894
  Clement Ho authored Jun 18, 2018
  
  14528894
- Correct CE-EE parity in two CI-related specs · 6a684432
  Robert Speicher authored Jun 18, 2018
  
  6a684432
- Merge branch '48050-add-full-commit-sha' into 'master' · afa47b7c
  Tim Zallmann authored Jun 18, 2018
```
Resolve "Use long sha version in MR widget copy to clipboard button"

Closes #48050

See merge request gitlab-org/gitlab-ce!19955
```
  afa47b7c
- Merge branch '46861-issuable-title-with-longer-username' into 'master' · bfa7983d
  Clement Ho authored Jun 18, 2018
```
Buttons disappear on merge request page in some case

Closes #46861 and #14348

See merge request gitlab-org/gitlab-ce!19176
```
  bfa7983d
- CE-EE parity to spec/lib/gitlab/ci/config_spec.rb · 557f4e6a
  Robert Speicher authored Jun 18, 2018
  
  557f4e6a
- CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rb · 9c480891
  Robert Speicher authored Jun 18, 2018
  
  9c480891
- CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb · 5679beb2
  Robert Speicher authored Jun 18, 2018
  
  5679beb2
- Merge branch 'ce-4966-persistent-flash-banner-styles' into 'master' · ab7bd6dc
  Annabel Gray authored Jun 18, 2018
```
CE Backport: Add styles for persistent notice banner

See merge request gitlab-org/gitlab-ce!19968
```
  ab7bd6dc
- Add styles for persistent notice banner · 568493a2
  Kushal Pandya authored Jun 18, 2018
  
  568493a2
- Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rb · 404b49a7
  Robert Speicher authored Jun 18, 2018
  
  404b49a7
- Merge branch 'bvl-i18n-validation' into 'master' · 52dea971
  Rémy Coutable authored Jun 18, 2018
```
Updates to `.po` & `.pot` linting

Closes #46096 et #39292

See merge request gitlab-org/gitlab-ce!18779
```
  52dea971
- Rails5 fix format in uploads actions · 4f76d953
  Jasper Maes authored Jun 15, 2018
  
  4f76d953
- Merge branch '5956-auto-devops-multi-cluster-help-text' into 'master' · f67eb5a1
  Clement Ho authored Jun 18, 2018
```
port 5956-auto-devops-multi-cluster-help-text to CE

See merge request gitlab-org/gitlab-ce!19680
```
  f67eb5a1
- Merge branch 'dm-blockquote-trailing-whitespace' into 'master' · 8451c5ff
  Sean McGivern authored Jun 18, 2018
```
Allow trailing whitespace on blockquote fence lines

See merge request gitlab-org/gitlab-ce!19960
```
  8451c5ff
- Merge branch 'dm-favicon-redirect' into 'master' · 3c725a2a
  Sean McGivern authored Jun 18, 2018
```
Redirect favicon.(png|ico) to actual favicon asset or upload

Closes #47840

See merge request gitlab-org/gitlab-ce!19956
```
  3c725a2a
- Merge branch 'patch-28' into 'master' · d222bafe
  Achilleas Pipinellis authored Jun 18, 2018
```
Update README.md to clarify EFS is slow and not to use this guide.

See merge request gitlab-org/gitlab-ce!19852
```
  d222bafe
- Update README.md to clarify EFS is slow and not to use this guide. · 590640d1
  Lee Matos authored Jun 18, 2018
  
  590640d1
- Merge branch 'rails5-fix-db-check' into 'master' · 7849fd36
  Yorick Peterse authored Jun 18, 2018
```
Rails5 fix db check: connection execute returns integer instead of string

See merge request gitlab-org/gitlab-ce!19901
```
  7849fd36
- Merge branch... · 88442e02
  Yorick Peterse authored Jun 18, 2018
```
Merge branch 'blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespace' into 'master'

Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Namespace"

Closes #48014

See merge request gitlab-org/gitlab-ce!19918
```
  88442e02
- Merge branch 'rails5-fix-48012' into 'master' · 3df1a733
  Yorick Peterse authored Jun 18, 2018
```
Rails5 fix passing Group objects array into for_projects_and_groups milestone scope

Closes #48012

See merge request gitlab-org/gitlab-ce!19920
```
  3df1a733
- Merge branch '2211-add-option-to-change-clone-path-docs' into 'master' · aeb3df17
  Achilleas Pipinellis authored Jun 18, 2018
```
Document Custom build directories

Closes gitlab-runner#2211

See merge request gitlab-org/gitlab-ce!19664
```
  aeb3df17
- Merge branch 'docs-coached-20180614-1' into 'master' · fa4f71e4
  Achilleas Pipinellis authored Jun 18, 2018
```
fixed broken link to git cheat sheet

See merge request gitlab-org/gitlab-ce!19879
```
  fa4f71e4
- Merge branch '46429-creating-a-deploy-token-doesn-t-bring-back-to-the-creation-page' into 'master' · 519d0477
  Fatih Acet authored Jun 18, 2018
```
Resolve "Creating a deploy token doesn't bring back to the creation page"

Closes #46429

See merge request gitlab-org/gitlab-ce!19639
```
  519d0477
- Resolve "Creating a deploy token doesn't bring back to the creation page" · f4ab8fe3
  Sam Beckham authored Jun 18, 2018
  
  f4ab8fe3
- Allow trailing whitespace on blockquote fence lines · b762fc4b
  Douwe Maan authored Jun 18, 2018
  
  b762fc4b
- Redirect favicon.(png|ico) to actual favicon asset or upload · 2a402a3e
  Douwe Maan authored Jun 18, 2018
  
  2a402a3e
- Uses long sha version of the merged commit in MR widget copy to clipboard button · 1533dbf9
  Filipa Lacerda authored Jun 18, 2018
  
  1533dbf9
- Merge branch '47672-set_inline_content_type_for_ics' into 'master' · a170c587
  Douwe Maan authored Jun 18, 2018
```
Render calendar feed inline when accessed from GitLab

Closes #47672

See merge request gitlab-org/gitlab-ce!19698
```
  a170c587
- Merge branch... · 47bfd782
  Rémy Coutable authored Jun 18, 2018
```
Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master'

Resolve "[Rails5] expected the response to have status code :ok but it was 404"

Closes #48008

See merge request gitlab-org/gitlab-ce!19937
```
  47bfd782
- Merge branch 'rails5-fix-48009' into 'master' · 95753b5e
  Rémy Coutable authored Jun 18, 2018
```
Rails5 update Gemfile.rails5.lock

Closes #48009

See merge request gitlab-org/gitlab-ce!19921
```
  95753b5e
- Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' into 'master' · 781e0da9
  Rémy Coutable authored Jun 18, 2018
```
Resolve "[Rails5] expected: "/search?search=seed_project" got: nil"

Closes #48013

See merge request gitlab-org/gitlab-ce!19936
```
  781e0da9
- Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into 'master' · 52f53c2e
  Rémy Coutable authored Jun 18, 2018
```
[Rails5] Fix pipeline_schedules_controller_spec

Closes #48011

See merge request gitlab-org/gitlab-ce!19919
```
  52f53c2e