Commits · b2c69c5993872d7f005ce6a4f840f119ffaeb560 · nexedi / gitlab-ce

09 Mar, 2019 8 commits
- Automatic merge of gitlab-org/gitlab-ce master · b2c69c59
  GitLab Bot authored Mar 09, 2019
  
  b2c69c59
- Merge branch 'fix-error-msg-typo' into 'master' · fa90b10f
  Nick Thomas authored Mar 09, 2019
```
Update cleanup.rake to fix a typo in the error message

See merge request gitlab-org/gitlab-ce!25901
```
  fa90b10f
- Merge branch 'filter-merge-requests-by-target-branch' into 'master' · 106888fb
  Nick Thomas authored Mar 09, 2019
```
Filter merge requests by target branch

See merge request gitlab-org/gitlab-ce!24380
```
  106888fb
- Filter merge requests by target branch · de784ac1
  Hiroyuki Sato authored Mar 09, 2019
  
  de784ac1
- Merge branch 'ee-filter-merge-requests-by-target-branch' into 'master' · 40418f28
  Nick Thomas authored Mar 09, 2019
```
EE port of filter merge requests by target branch

See merge request gitlab-org/gitlab-ee!9927
```
  40418f28
- Refactor backend · 823235f8
  Hiroyuki Sato authored Mar 09, 2019
```
Conflicts:
  config/routes.rb
```
  823235f8
- Automatic merge of gitlab-org/gitlab-ce master · 78509cee
  GitLab Bot authored Mar 09, 2019
  
  78509cee
- Merge branch 'fix/email_validator' into 'master' · 6908c5f7
  Stan Hu authored Mar 09, 2019
```
Align EmailValidator to validate_email gem implementation.

Closes #57352

See merge request gitlab-org/gitlab-ce!24971
```
  6908c5f7
08 Mar, 2019 32 commits
- Merge branch 'docs-add-review-apps-doc-to-ci-index-ee' into 'master' · 68ad0116
  Mike Lewis authored Mar 08, 2019
```
Docs: add Review Apps link to list of CI/CD topics

See merge request gitlab-org/gitlab-ee!9937
```
  68ad0116
- Docs: add Review Apps link to list of CI/CD topics · ad6216fc
  Marcia Ramos authored Mar 08, 2019
  
  ad6216fc
- Automatic merge of gitlab-org/gitlab-ce master · 6b259fd1
  GitLab Bot authored Mar 08, 2019
  
  6b259fd1
- Merge branch 'mg-remove-select2-rails' into 'master' · 1e7a7993
  Marin Jankovski authored Mar 08, 2019
```
Remove select2-rails (select2 is now installed via yarn)

See merge request gitlab-org/gitlab-ce!25929
```
  1e7a7993
- Remove select2-rails (select2 is now installed via yarn) · a8e603d2
  Mike Greiling authored Mar 08, 2019
  
  a8e603d2
- Automatic merge of gitlab-org/gitlab-ce master · 90d4276a
  GitLab Bot authored Mar 08, 2019
  
  90d4276a
- Merge branch 'docs-fix-ci-intro-typos' into 'master' · 628b5c09
  Mike Lewis authored Mar 08, 2019
```
Docs: intro to CI/CD - fix typos

See merge request gitlab-org/gitlab-ce!25917
```
  628b5c09
- Docs: intro to CI/CD - fix typos · 63eb4f7d
  Marcia Ramos authored Mar 08, 2019
  
  63eb4f7d
- Automatic merge of gitlab-org/gitlab-ce master · 3c11e5b5
  GitLab Bot authored Mar 08, 2019
  
  3c11e5b5
- Merge branch 'winh-catch-docs-and-master' into 'master' · f3f02f56
  Phil Hughes authored Mar 08, 2019
```
Skip gitlab:ui:visual job for docs again

See merge request gitlab-org/gitlab-ce!25922
```
  f3f02f56
- Skip gitlab:ui:visual job for docs and master · 21ba1138
  Winnie Hellmann authored Mar 08, 2019
  
  21ba1138
- Automatic merge of gitlab-org/gitlab-ce master · 4919c0e6
  GitLab Bot authored Mar 08, 2019
  
  4919c0e6
- Merge branch 'revert-d1960efd' into 'master' · 26477f38
  Phil Hughes authored Mar 08, 2019
```
Revert "Merge branch 'remove-select2-rails' into 'master'"

See merge request gitlab-org/gitlab-ce!25920
```
  26477f38
- Merge branch '20084-update-the-spinner-component' into 'master' · 40016ab7
  Fatih Acet authored Mar 08, 2019
```
Fix gl-loading-icon bug before gitlab-ui update

See merge request gitlab-org/gitlab-ce!25683
```
  40016ab7
- Fix gl-loading-icon bug before gitlab-ui update · d81a5fce
  Brandon Labuschagne authored Mar 08, 2019
  
  d81a5fce
- Revert "Merge branch 'remove-select2-rails' into 'master'" · ec1724da
  Marin Jankovski authored Mar 08, 2019
```
This reverts merge request !17871
```
  ec1724da
- Automatic merge of gitlab-org/gitlab-ce master · a7c3aec4
  GitLab Bot authored Mar 08, 2019
  
  a7c3aec4
- Merge branch 'sitcky-prefix-fix' into 'master' · c8116ebd
  Filipa Lacerda authored Mar 08, 2019
```
Fixed sticky bar styling in Safari

Closes #58625

See merge request gitlab-org/gitlab-ce!25913
```
  c8116ebd
- Merge branch 'improve-insights-feature-check' into 'master' · 4dd78aa2
  Lin Jen-Shin authored Mar 08, 2019
```
Improve the Insights feature availability check

See merge request gitlab-org/gitlab-ee!9910
```
  4dd78aa2
- Merge branch 'improve-admin-licence-page-rest-docs' into 'master' · 7af50aff
  Lin Jen-Shin authored Mar 08, 2019
```
DOCS GET /licenses and DELETE /license/:id API

See merge request gitlab-org/gitlab-ee!9770
```
  7af50aff
- Fixed sticky bar styling in Safari · cf05e49f
  Phil Hughes authored Mar 08, 2019
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58625
```
  cf05e49f
- Improve the Insights feature availability check · 8df03494
  Rémy Coutable authored Mar 07, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8df03494
- Automatic merge of gitlab-org/gitlab-ce master · dbad902a
  GitLab Bot authored Mar 08, 2019
  
  dbad902a
- Merge branch 'deploy-keys-ext' into 'master' · b4852ab4
  Filipa Lacerda authored Mar 08, 2019
```
Externalize admin deploy keys strings

See merge request gitlab-org/gitlab-ce!24712
```
  b4852ab4
- Merge branch 'ee-deploy-keys-ext' into 'master' · 012992ea
  Filipa Lacerda authored Mar 08, 2019
```
EE Externalize admin deploy keys strings

See merge request gitlab-org/gitlab-ee!9926
```
  012992ea
- Automatic merge of gitlab-org/gitlab-ce master · a66c1d3c
  GitLab Bot authored Mar 08, 2019
  
  a66c1d3c
- Merge branch 'ce-billings-gold-trial-callout-fe-dashboard' into 'master' · 9372a6ca
  Sean McGivern authored Mar 08, 2019
```
CE FE Refactor dashboard gold trial callouts

See merge request gitlab-org/gitlab-ce!25483
```
  9372a6ca
- Merge branch 'billings-gold-trial-callout-fe-dashboard' into 'master' · 7c54c171
  Sean McGivern authored Mar 08, 2019
```
FE Refactor dashboard gold trial callouts

See merge request gitlab-org/gitlab-ee!9644
```
  7c54c171
- Automatic merge of gitlab-org/gitlab-ce master · 98d3448c
  GitLab Bot authored Mar 08, 2019
  
  98d3448c
- Merge branch '56864-reopen-locked-mr' into 'master' · e61cce36
  Sean McGivern authored Mar 08, 2019
```
Disallow reopening of locked merge request

Closes #56864

See merge request gitlab-org/gitlab-ce!24882
```
  e61cce36
- Disallow reopening of locked merge requests · eba4b940
  Jan Beckmann authored Mar 08, 2019
```
Fixes #56864
```
  eba4b940
- Merge branch '4925-open-issues-based-on-prometheus-alerts-controller-ce' into 'master' · 66481881
  Kamil Trzciński authored Mar 08, 2019
```
Remove unnecessary license check in operations controller

See merge request gitlab-org/gitlab-ce!25728
```
  66481881