Commits · aa73ef0a55fbad5c3f33316c43a37e91c83390cd · nexedi / gitlab-ce

02 Jul, 2018 3 commits
- Geo: Support git-lfs push to secondary redirect · aa73ef0a
  Ash McKenzie authored Jun 13, 2018
  
  aa73ef0a
- Move check logic into #batch_operation_disallowed? · f0164abc
  Ash McKenzie authored Jun 13, 2018
  
  f0164abc
- Better route matching for read-only detection · 051ac7d5
  Ash McKenzie authored Jun 13, 2018
  
  051ac7d5
19 Jun, 2018 4 commits
- Merge branch 'extra-ee-specific-lines-from-discussion-views' into 'master' · fc420ded
  Rémy Coutable authored Jun 19, 2018
```
Extract EE-specific lines from discussion views

Closes #6103 et #6226

See merge request gitlab-org/gitlab-ee!6129
```
  fc420ded
- Merge branch 'jej/group-saml-settings-link-checks-license' into 'master' · e01a5098
  Douwe Maan authored Jun 19, 2018
```
Group SAML settings link checks license

See merge request gitlab-org/gitlab-ee!6147
```
  e01a5098
- Merge branch 'rs-spec-lib-gitlab-ci-parity-ee' into 'master' · 4ea6866d
  Rémy Coutable authored Jun 19, 2018
```
[EE] Extract EE specific files/lines for spec/lib/gitlab/ci

See merge request gitlab-org/gitlab-ee!6173
```
  4ea6866d
- Group SAML settings link checks license · 99bdebd5
  James Edwards-Jones authored Jun 15, 2018
  
  99bdebd5
18 Jun, 2018 33 commits
- Correct CE-EE parity in two CI-related specs · 5902b6e1
  Robert Speicher authored Jun 18, 2018
  
  5902b6e1
- Merge branch '5538-svg' into 'master' · 6e24d965
  Tim Zallmann authored Jun 18, 2018
```
Resolve "Use `long-arrow` icon in downstream pipeline instead of importing the svg into the vue component"

Closes #5538

See merge request gitlab-org/gitlab-ee!6132
```
  6e24d965
- Merge branch '6474-fix-assignees-list-showing-on-unsupported-license' into 'master' · 0e4ee261
  Robert Speicher authored Jun 18, 2018
```
Resolve "Assignee list UI should only appear in Premium or higher"

Closes #6474

See merge request gitlab-org/gitlab-ee!6171
```
  0e4ee261
- Add tests for dropdown list type check · 21d5eadf
  Kushal Pandya authored Jun 19, 2018
  
  21d5eadf
- CE-EE parity to spec/lib/gitlab/ci/pipeline/chain/create_spec.rb · 66d1baf9
  Robert Speicher authored Jun 18, 2018
  
  66d1baf9
- CE-EE parity to spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb · 00bcbfa4
  Robert Speicher authored Jun 18, 2018
  
  00bcbfa4
- CE-EE parity to spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb · 2671512e
  Robert Speicher authored Jun 18, 2018
  
  2671512e
- Use Core dropdown list when license doesn't support assignees list · 481b2e91
  Kushal Pandya authored Jun 18, 2018
  
  481b2e91
- Merge branch '4966-geo-secondary-banner-styling' into 'master' · e1792086
  Annabel Gray authored Jun 18, 2018
```
Update read-only message banner styling for Geo secondary node

Closes #4966

See merge request gitlab-org/gitlab-ee!6135
```
  e1792086
- Merge branch 'sh-cache-push-rule-global-lookup' into 'master' · f62e09e7
  Robert Speicher authored Jun 18, 2018
```
Memoize the global default for push rules within the request

Closes #6465

See merge request gitlab-org/gitlab-ee!6160
```
  f62e09e7
- Merge branch 'ce-to-ee-2018-06-18' into 'master' · ef0d1748
  Marin Jankovski authored Jun 18, 2018
```
CE upstream - 2018-06-18 15:21 UTC

Closes gitlab-runner#2211

See merge request gitlab-org/gitlab-ee!6170
```
  ef0d1748
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-18 · e24440de
  GitLab Bot authored Jun 18, 2018
  
  e24440de
- Merge branch '6053-geo-slow-join-query-with-project_repository_states' into 'master' · e6f21f01
  Nick Thomas authored Jun 18, 2018
```
Resolve "Geo: Slow JOIN query with project_repository_states"

Closes #6053

See merge request gitlab-org/gitlab-ee!5879
```
  e6f21f01
- Merge branch 'ce-to-ee-2018-06-18' into 'master' · 53a6b2d9
  Filipa Lacerda authored Jun 18, 2018
```
CE upstream - 2018-06-18 09:22 UTC

See merge request gitlab-org/gitlab-ee!6168
```
  53a6b2d9
- 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
- Remove EE-specific code from new MR email · 17821419
  Sean McGivern authored Jun 12, 2018
  
  17821419
- Remove EE-specific code from rejection mailer · a286a024
  Sean McGivern authored Jun 12, 2018
  
  a286a024
- Remove EE-specific code from logs tree dropdown · d4d86f93
  Sean McGivern authored Jun 11, 2018
  
  d4d86f93
- Remove EE-specific code from project milestone page · d161f031
  Sean McGivern authored Jun 11, 2018
  
  d161f031
- Remove EE-specific code from blob header · ea2cda27
  Sean McGivern authored Jun 11, 2018
  
  ea2cda27
- Redirect favicon.(png|ico) to actual favicon asset or upload · 2a402a3e
  Douwe Maan authored Jun 18, 2018
  
  2a402a3e
- Merge branch 'ee-specific-line-check-spelling' into 'master' · be1825fa
  Rémy Coutable authored Jun 18, 2018
```
Grammar fixes in EE build script

See merge request gitlab-org/gitlab-ee!6157
```
  be1825fa