Commits · 80c34ea1584730eacece2d71903282178b849def · nexedi / gitlab-ce

27 Mar, 2019 2 commits
- Merge branch 'docs-ee-badges1' into 'master' · 80c34ea1
  Evan Read authored Mar 27, 2019
```
Docs: Correct badges for two EE links

Closes #10632

See merge request gitlab-org/gitlab-ee!10395
```
  80c34ea1
- Docs: Correct badges for two EE links · a8b17964
  Marcel Amirault authored Mar 27, 2019
  
  a8b17964
26 Mar, 2019 38 commits
- Automatic merge of gitlab-org/gitlab-ce master · 5e7f38f2
  GitLab Bot authored Mar 26, 2019
  
  5e7f38f2
- Merge branch '48132-display-output-from-pre-receive-scripts' into 'master' · 535bd574
  Dmitriy Zaporozhets authored Mar 26, 2019
```
Allow custom hooks errors to appear in GitLab UI

Closes #48132

See merge request gitlab-org/gitlab-ce!25625
```
  535bd574
- Automatic merge of gitlab-org/gitlab-ce master · c0b845c1
  GitLab Bot authored Mar 26, 2019
  
  c0b845c1
- Merge branch... · 81fe9e9b
  Rémy Coutable authored Mar 26, 2019
```
Merge branch '49910-reopening-a-closed-milestone-from-the-closed-milestones-page-fails2' into 'master'

Fix bug when reopening milestone from index page

Closes #49910

See merge request gitlab-org/gitlab-ce!26597
```
  81fe9e9b
- Merge branch 'revert-45aa8f14' into 'master' · 79dbe418
  Phil Hughes authored Mar 26, 2019
```
Revert "Merge branch 'use-bootstrap-selector' into 'master'"

See merge request gitlab-org/gitlab-ee!10431
```
  79dbe418
- Automatic merge of gitlab-org/gitlab-ce master · 9ca20fe7
  GitLab Bot authored Mar 26, 2019
  
  9ca20fe7
- Merge branch 'revert-0be93623' into 'master' · b0a873aa
  Phil Hughes authored Mar 26, 2019
```
Revert "Merge branch 'remove-unused-css-from-mr-24724' into 'master'"

See merge request gitlab-org/gitlab-ce!26609
```
  b0a873aa
- Automatic merge of gitlab-org/gitlab-ce master · 8e47c2f9
  GitLab Bot authored Mar 26, 2019
  
  8e47c2f9
- Merge branch 'jc-add-docs-for-gitaly-feature-flags' into 'master' · 342f9604
  Achilleas Pipinellis authored Mar 26, 2019
```
Add development documentation for gitaly feature flags

See merge request gitlab-org/gitlab-ce!25624
```
  342f9604
- Merge branch 'doc-gitaly-ruby-workers' into 'master' · b0ed83e0
  Achilleas Pipinellis authored Mar 26, 2019
```
Add admin documentation for gitaly-ruby

See merge request gitlab-org/gitlab-ce!26605
```
  b0ed83e0
- Add admin documentation for gitaly-ruby · f52ae5b4
  Jacob Vosmaer authored Mar 26, 2019
  
  f52ae5b4
- Merge branch 'osw-multi-assignees-merge-requests-migration' into 'master' · 19010942
  Douglas Barbosa Alexandre authored Mar 26, 2019
```
Add multiple MR assignees migration and background table population

See merge request gitlab-org/gitlab-ce!26496
```
  19010942
- Merge branch 'osw-multi-assignees-merge-requests-migration-ee' into 'master' · 83a3ba0f
  Douglas Barbosa Alexandre authored Mar 26, 2019
```
[CE port] Add multiple MR assignees migration and background table population

See merge request gitlab-org/gitlab-ee!10411
```
  83a3ba0f
- Automatic merge of gitlab-org/gitlab-ce master · 23801d8f
  GitLab Bot authored Mar 26, 2019
  
  23801d8f
- Merge branch 'sh-bump-rugged-0.28.1' into 'master' · 61ffcebd
  Robert Speicher authored Mar 26, 2019
```
Bump Rugged to 0.28.1

See merge request gitlab-org/gitlab-ce!26595
```
  61ffcebd
- Merge branch 'backport-api-parameters' into 'master' · 2b3f0724
  Robert Speicher authored Mar 26, 2019
```
Backport EE API parameters in lib/api

See merge request gitlab-org/gitlab-ce!26369
```
  2b3f0724
- Merge branch 'ee-backport-api-parameters' into 'master' · 15762985
  Robert Speicher authored Mar 26, 2019
```
EE: Backport EE API parameters in lib/api

See merge request gitlab-org/gitlab-ee!10326
```
  15762985
- Merge branch 'docs/improve-emoji-display' into 'master' · 637dc389
  Achilleas Pipinellis authored Mar 26, 2019
```
Fix display of emoji in GFM docs

See merge request gitlab-org/gitlab-ce!26527
```
  637dc389
- Fix display of emoji in GFM docs · be051224
  Evan Read authored Mar 26, 2019
  
  be051224
- Merge branch '49856-upgrade-bootstrap-form-gem' into 'master' · 13800e1f
  Annabel Dunstone Gray authored Mar 26, 2019
```
Upgrade bootstrap_form Gem

Closes #49856

See merge request gitlab-org/gitlab-ce!26568
```
  13800e1f
- Merge branch 'zj-unify-ref-service-spec-ce-ee' into 'master' · a00c0050
  Yorick Peterse authored Mar 26, 2019
```
GitalyClient spec: Remove the diff between CE/EE

See merge request gitlab-org/gitlab-ce!26610
```
  a00c0050
- Merge branch 'docs-redirects4' into 'master' · 67ece2ef
  Achilleas Pipinellis authored Mar 26, 2019
```
Docs: Add automatic redirects to last batch of moved files

See merge request gitlab-org/gitlab-ce!25904
```
  67ece2ef
- Docs: Add automatic redirects to last batch of moved files · 29ba3930
  Marcel Amirault authored Mar 26, 2019
  
  29ba3930
- Automatic merge of gitlab-org/gitlab-ce master · 5f475d63
  GitLab Bot authored Mar 26, 2019
  
  5f475d63
- Merge branch 'docs/edit-wiki-notes' into 'master' · 9fb750e0
  Achilleas Pipinellis authored Mar 26, 2019
```
Edit wiki notes

See merge request gitlab-org/gitlab-ce!26452
```
  9fb750e0
- Edit wiki notes · bcfc493a
  Evan Read authored Mar 26, 2019
  
  bcfc493a
- Merge branch 'docs/edit-wiki-notes-ee' into 'master' · 24184624
  Achilleas Pipinellis authored Mar 26, 2019
```
Edit wiki notes

See merge request gitlab-org/gitlab-ee!10393
```
  24184624
- Edit wiki notes · 4962034f
  Evan Read authored Mar 26, 2019
  
  4962034f
- Fix bug when reopening milestone from index page · d97d35d3
  Mark Fletcher authored Mar 26, 2019
  
  d97d35d3
- Automatic merge of gitlab-org/gitlab-ce master · 72419dc3
  GitLab Bot authored Mar 26, 2019
  
  72419dc3
- Merge branch 'dm-md-css' into 'master' · 01c40ae2
  Annabel Dunstone Gray authored Mar 26, 2019
```
Untangle Markdown/Diffs/Notes CSS mess

See merge request gitlab-org/gitlab-ce!26493
```
  01c40ae2
- Merge branch 'dm-md-css-ee' into 'master' · 330af830
  Annabel Dunstone Gray authored Mar 26, 2019
```
[EE] Untangle Markdown/Diffs/Notes CSS mess

See merge request gitlab-org/gitlab-ee!10392
```
  330af830
- Merge branch 'qa-ml-do-not-skip-login-page-check' into 'master' · ca689fa3
  Ramya Authappan authored Mar 26, 2019
```
[QA] Don't skip the login page check

See merge request gitlab-org/gitlab-ee!10414
```
  ca689fa3
- Leave `d-flex-center` out of approvals_footer · f6d80956
  Paul Slaughter authored Mar 26, 2019
```
**Why?**
Even though we technically want this centered, 
for some reason the actual icon isn't quite
centered, so it looks better when left alone.
```
  f6d80956
- Automatic merge of gitlab-org/gitlab-ce master · b4293c6c
  GitLab Bot authored Mar 26, 2019
  
  b4293c6c
- Merge branch 'fix-hidden-statistics' into 'master' · 8947103f
  Nick Thomas authored Mar 26, 2019
```
Show statistics also when repository is disabled

Closes #59390

See merge request gitlab-org/gitlab-ce!26509
```
  8947103f
- GitalyClient spec: Remove the diff between CE/EE · 60c28a5f
  Zeger-Jan van de Weg authored Mar 26, 2019
  
  60c28a5f
- Merge branch 'winh-remove-sushi' into 'master' · 6ac86054
  Mike Greiling authored Mar 26, 2019
```
Remove .raw from JavaScript fixture file names

Closes #59201

See merge request gitlab-org/gitlab-ce!26545
```
  6ac86054