Commits · 94c7acd10fff2bbd8fd4f6c8562f040380133110 · nexedi / gitlab-ce

22 Sep, 2017 40 commits
- Merge branch 'docs-update-ux-guide' into 'master' · 94c7acd1
  Marcia Ramos authored Sep 22, 2017
```
fix typo in icons section

See merge request gitlab-org/gitlab-ce!14444
```
  94c7acd1
- Merge branch 'post_receive_n_plus_1_workaround' into 'master' · 28d57445
  Robert Speicher authored Sep 22, 2017
```
Workaround for #38259

See merge request gitlab-org/gitlab-ce!14453
```
  28d57445
- Workaround for #38259 · 9f71ea0d
  Andrew Newdigate authored Sep 22, 2017
  
  9f71ea0d
- Merge branch 'dm-group-share-lock-default-help' into 'master' · e85e803c
  Rémy Coutable authored Sep 22, 2017
```
Inform user that current shared projects will remain shared

Closes #38220

See merge request gitlab-org/gitlab-ce!14441
```
  e85e803c
- Merge branch 'remove-redundant-icons' into 'master' · 7054afa3
  Annabel Dunstone Gray authored Sep 22, 2017
```
Removed old icons from project page

Closes #36567

See merge request gitlab-org/gitlab-ce!14185
```
  7054afa3
- Removed old icons from project page · 8ceaafae
  Phil Hughes authored Sep 22, 2017
  
  8ceaafae
- Merge branch 'ee-to-ce-2017-09-22' into 'master' · 17251d04
  Rémy Coutable authored Sep 22, 2017
```
Don't show %board-add-issues-modal if there's no project

See merge request gitlab-org/gitlab-ce!14442
```
  17251d04
- Merge branch 'winh-i18-branches-page' into 'master' · a0eebff8
  Phil Hughes authored Sep 22, 2017
```
Make branches page translatable

Closes #32797

See merge request gitlab-org/gitlab-ce!14221
```
  a0eebff8
- Make branches page translatable · 920c0de5
  Winnie Hellmann authored Sep 22, 2017
  
  920c0de5
- Merge branch 'jej/demonstrate-details-summary' into 'master' · f9df0e13
  Achilleas Pipinellis authored Sep 22, 2017
```
Demonstrate <details> and <summary> tags in doc/user/markdown.md

See merge request gitlab-org/gitlab-ce!14247
```
  f9df0e13
- Merge branch 'feature/migrate-repository-diff' into 'master' · 604f176b
  Douwe Maan authored Sep 22, 2017
```
Migrate Gitlab::Git::Repository#diff to Gitaly

Closes gitaly#524

See merge request gitlab-org/gitlab-ce!14251
```
  604f176b
- Merge branch 'ee-add-project-repository-storages-index' into 'master' · d426b6bc
  Douwe Maan authored Sep 22, 2017
```
Index projects on repository storage

See merge request gitlab-org/gitlab-ce!14414
```
  d426b6bc
- fix typo in icons section · 61ff5305
  Sarrah Vesselov authored Sep 22, 2017
  
  61ff5305
- Merge branch 'replace_project_shortcuts.feature' into 'master' · c01bd64f
  Rémy Coutable authored Sep 22, 2017
```
Replace the 'project/shortcuts.feature' spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!14431
```
  c01bd64f
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 8d571b14
  Jarka Kadlecova authored Sep 22, 2017
  
  8d571b14
- Merge branch '38197-fix-ImapAuthenticationCheck' into 'master' · fa72d346
  Douwe Maan authored Sep 22, 2017
```
Fix `rake gitlab:incoming_email:check`

Closes #38197

See merge request gitlab-org/gitlab-ce!14423
```
  fa72d346
- Merge branch '38234-reserve-refs-replace' into 'master' · 03359bcc
  Rémy Coutable authored Sep 22, 2017
```
Reserve refs/replace because `git-replace` is using it

Closes #38234

See merge request gitlab-org/gitlab-ce!14436
```
  03359bcc
- Don't show it if there's no project. · f67c2ead
  Lin Jen-Shin authored Sep 22, 2017
```
This is aligning with EE
```
  f67c2ead
- Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master' · 41eea4fd
  Rémy Coutable authored Sep 22, 2017
```
Adds gitlab features and components to usage ping data.

Closes #33328

See merge request gitlab-org/gitlab-ce!14305
```
  41eea4fd
- Update CHANGELOG.md for 10.0.0 · 84a7c487
  Jarka Kadlecova authored Sep 22, 2017
```
[ci skip]
```
  84a7c487
- Merge branch 'sh-blob-raw-check' into 'master' · 408c5952
  Douwe Maan authored Sep 22, 2017
```
Ensure that Blob.raw returns always returns a valid blob object

See merge request gitlab-org/gitlab-ce!14412
```
  408c5952
- Inform user that current shared projects will remain shared · a62cc3d1
  Douwe Maan authored Sep 22, 2017
  
  a62cc3d1
- Merge branch '32782-i18n-support-pagination' into 'master' · 41068df7
  Tim Zallmann authored Sep 22, 2017
```
Add i18n support to pagination widget

See merge request gitlab-org/gitlab-ce!14407
```
  41068df7
- Merge branch 'emoji-dom-size' into 'master' · 34462621
  Fatih Acet authored Sep 22, 2017
```
Improve emoji menu rendering performance

Closes #36949

See merge request gitlab-org/gitlab-ce!14233
```
  34462621
- Merge branch '38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docs' into 'master' · c8e60d63
  Achilleas Pipinellis authored Sep 22, 2017
```
Fix bad link on GitLab Omnibus Helm chart page - docs

Closes #38016

See merge request gitlab-org/gitlab-ce!14346
```
  c8e60d63
- Merge branch 'backport-ee-2983' into 'master' · cb8e2624
  Rémy Coutable authored Sep 22, 2017
```
Simplify a test

See merge request gitlab-org/gitlab-ce!14415
```
  cb8e2624
- Reserve refs/replace cos `git-replace` is using it · c65cbffa
  Lin Jen-Shin authored Sep 22, 2017
```
See:
* https://www.kernel.org/pub/software/scm/git/docs/git-replace.html
* https://git-scm.com/book/en/v2/Git-Tools-Replace
```
  c65cbffa
- Merge branch '36231-better-svg-usage-in-the-frontend' into 'master' · 26607a16
  Phil Hughes authored Sep 22, 2017
```
Resolve "Better SVG Usage in the Frontend"

Closes #36231

See merge request gitlab-org/gitlab-ce!13435
```
  26607a16
- Resolve "Better SVG Usage in the Frontend" · 55f772bb
  Tim Zallmann authored Sep 22, 2017
  
  55f772bb
- Merge branch 'add-view-replaced-file-link' into 'master' · d103e955
  Rémy Coutable authored Sep 22, 2017
```
Add view replaced file link for image diffs

See merge request gitlab-org/gitlab-ce!14394
```
  d103e955
- Merge branch 'docs/fix-review-docs-cleanup-job' into 'master' · f357fc7d
  Rémy Coutable authored Sep 22, 2017
```
Do not clone the repo when running the review-docs jobs

See merge request gitlab-org/gitlab-ce!14420
```
  f357fc7d
- Merge branch 'replace_project_service.feature' into 'master' · 97667028
  Rémy Coutable authored Sep 22, 2017
```
Replace the 'project/service.feature' spinach test with an rspec analog

Closes #23036

See merge request gitlab-org/gitlab-ce!14432
```
  97667028
- Merge branch 'voogsgerd/gitlab-ce-daniel-legacy-config' into 'master' · 70891b3b
  Rémy Coutable authored Sep 22, 2017
```
Removed two legacy config options

See merge request gitlab-org/gitlab-ce!14425
```
  70891b3b
- Merge branch 'fix-multi-line-hook-output' into 'master' · d2d5549d
  Rémy Coutable authored Sep 22, 2017
```
Display full pre-receive and post-receive hook output in GitLab UI

Closes #25214

See merge request gitlab-org/gitlab-ce!14222
```
  d2d5549d
- Replace the 'project/service.feature' spinach test with an rspec analog · 0fc604e5
  Vitaliy @blackst0ne Klachkov authored Sep 22, 2017
  
  0fc604e5
- Replace the 'project/shortcuts.feature' spinach test with an rspec analog · 0ed3d8a0
  Vitaliy @blackst0ne Klachkov authored Sep 22, 2017
  
  0ed3d8a0
- Merge branch 'acet-fix-double-note-render' into 'master' · 9e46a897
  Jacob Schatz authored Sep 22, 2017
```
Fix rendering double note issue

Closes #38139

See merge request gitlab-org/gitlab-ce!14429
```
  9e46a897
- Removed two legacy config options · f4c45417
  Daniel Voogsgerd authored Nov 05, 2016
```
Removed the max_size and timeout options from the git config in
gitlab.yml.
```
  f4c45417
- Merge branch 'acet-switch-markdown-pane' into 'master' · bc33774f
  Jacob Schatz authored Sep 22, 2017
```
IssueNotes: Switch back to Write pane when note cancel or submit.

Closes #37907

See merge request gitlab-org/gitlab-ce!14402
```
  bc33774f
- Fix rendering double note issue. · f22f75b7
  Fatih Acet authored Sep 22, 2017
  
  f22f75b7