Commits · 22bb4872e657988bb8c133c515e8df4a0ad77785 · nexedi / gitlab-ce

04 Oct, 2017 31 commits
- Merge branch 'missing-exception-variable' into 'master' · 22bb4872
  Sean McGivern authored Oct 04, 2017
```
Add missing exception variable

See merge request gitlab-org/gitlab-ce!14677
```
  22bb4872
- Merge branch 'merge-request-notes-performance' into 'master' · b1050bfe
  Sean McGivern authored Oct 04, 2017
```
Use a UNION ALL for getting merge request notes

Closes #38508

See merge request gitlab-org/gitlab-ce!14620
```
  b1050bfe
- Merge branch 'js-load-specific-locales' into 'master' · b9f78eae
  Phil Hughes authored Oct 04, 2017
```
Load only the currently needed JS locale file

Closes #38470

See merge request gitlab-org/gitlab-ce!14533
```
  b9f78eae
- Load only the currently needed JS locale file · 412571a4
  Tim Zallmann authored Oct 04, 2017
  
  412571a4
- Merge branch 'fix_migration_with_fast_forward_option' into 'master' · 08678441
  Sean McGivern authored Oct 04, 2017
```
Fix AddFastForwardOptionToProject migration

See merge request gitlab-org/gitlab-ce!14676
```
  08678441
- Add missing exception variable · 45c5311a
  Jacob Vosmaer authored Oct 04, 2017
  
  45c5311a
- Merge remote-tracking branch 'dev/master' · 4a4f8093
  Jarka Kadlecova authored Oct 04, 2017
  
  4a4f8093
- Add a new migration to make sure that fast forward column exists in projects table · e40b018b
  Valery Sizov authored Oct 04, 2017
  
  e40b018b
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · a7411f0d
  Jarka Kadlecova authored Oct 04, 2017
  
  a7411f0d
- Merge branch '36742-hide-close-mr-button-on-merge' into 'master' · 96786507
  Fatih Acet authored Oct 04, 2017
```
Hide close MR button after merge without reloading page

Closes #36742

See merge request gitlab-org/gitlab-ce!14122
```
  96786507
- Merge branch 'dm-pat-revoke' into 'master' · ec40f74e
  Sean McGivern authored Oct 04, 2017
```
Set default scope on PATs that don't have one set to allow them to be revoked

Closes #38650

See merge request gitlab-org/gitlab-ce!14660
```
  ec40f74e
- Fix AddFastForwardOptionToProject migration · 416660c0
  Valery Sizov authored Oct 04, 2017
  
  416660c0
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 103ce928
  Jarka Kadlecova authored Oct 04, 2017
  
  103ce928
- Merge branch 'icons-profile-icons' into 'master' · 70b64c8d
  Phil Hughes authored Oct 04, 2017
```
Updated Profile Events Helper to use SVG Sprite Icons

See merge request gitlab-org/gitlab-ce!14577
```
  70b64c8d
- Updated Profile Events Helper to use SVG Sprite Icons · 2b12520d
  Tim Zallmann authored Oct 04, 2017
  
  2b12520d
- Merge branch '3612-update-script-template-order-in-vue-files' into 'master' · 88959e87
  Filipa Lacerda authored Oct 04, 2017
```
Re-arrange <script> tags before <template> tags in .vue files

Closes #38743

See merge request gitlab-org/gitlab-ce!14671
```
  88959e87
- Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master' · 12d275ad
  Filipa Lacerda authored Oct 04, 2017
```
Disable comment textarea while submitting a new comment.

Closes #37858

See merge request gitlab-org/gitlab-ce!14541
```
  12d275ad
- Merge branch 'winh-vue-styleguide-link-docs' into 'master' · be6344d9
  Filipa Lacerda authored Oct 04, 2017
```
Fix link to Vue.js style guide

See merge request gitlab-org/gitlab-ce!14667
```
  be6344d9
- Merge branch 'fix-ssh-key-mutation' into 'master' · f0b4fe2f
  Douwe Maan authored Oct 04, 2017
```
Ensure key fingerprints are generated correctly when modified

See merge request gitlab-org/gitlab-ce!14663
```
  f0b4fe2f
- Merge branch '31050-registry-image-lists' into 'master' · c958c201
  Grzegorz Bizon authored Oct 04, 2017
```
Lazy load and paginate registry image list

Closes #31050

See merge request gitlab-org/gitlab-ce!14303
```
  c958c201
- Merge branch '38417-use-explicit-boolean-vue-attribute' into 'master' · 912e6b0b
  Fatih Acet authored Oct 04, 2017
```
Use explicit boolean true attribute for show-disabled-button

Closes #38417

See merge request gitlab-org/gitlab-ce!14672
```
  912e6b0b
- Merge branch 'gitaly-delete-branch' into 'master' · c6e5a77e
  Douwe Maan authored Oct 04, 2017
```
Implement OperationService.UserDeleteBranch Gitaly RPC

See merge request gitlab-org/gitlab-ce!14603
```
  c6e5a77e
- Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master' · 2ee93c48
  Douwe Maan authored Oct 04, 2017
```
Reduce method calls while evaluating Projects::MergeRequestsController#show.json

See merge request gitlab-org/gitlab-ce!14285
```
  2ee93c48
- Merge branch 'sh-gitlab-qa-add-byebug' into 'master' · aaa57c9d
  Grzegorz Bizon authored Oct 04, 2017
```
Add byebug to GitLab QA gem list for debugging

See merge request gitlab-org/gitlab-ce!14675
```
  aaa57c9d
- Merge branch 'sh-fix-gitlab-qa-ee-license-add' into 'master' · e518b3e2
  Grzegorz Bizon authored Oct 04, 2017
```
Fix GitLab QA: increase window size to ensure License link shows

See merge request gitlab-org/gitlab-ce!14674
```
  e518b3e2
- Add byebug to GitLab QA gem list for debugging · f7f9b1f2
  Stan Hu authored Oct 03, 2017
  
  f7f9b1f2
- Fix GitLab QA: increase window size to ensure License link shows · e85387d5
  Stan Hu authored Oct 03, 2017
  
  e85387d5
- Reduce method calls while evaluating Projects::MergeRequestsController#show.json · 1f54c921
  Oswaldo Ferreira authored Oct 03, 2017
  
  1f54c921
- Use explicit boolean true attribute for show-disabled-button · b94a26ad
  Eric Eastwood authored Oct 03, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38417
```
  b94a26ad
- Re-arrange <script> tags before <template> tags in .vue files · b88f7060
  Eric Eastwood authored Oct 03, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38743
```
  b88f7060
- Add OperationService.UserDeleteBranch Gitaly RPC · 79719cf0
  Alejandro Rodríguez authored Sep 30, 2017
  
  79719cf0
03 Oct, 2017 9 commits
- Merge branch '38187-38315-fix-dropdown-open-top-bottom-spacing' into 'master' · 5a23af92
  Annabel Dunstone Gray authored Oct 03, 2017
```
Fix bottom spacing for dropdowns that open upwards

Closes #38187 and #38315

See merge request gitlab-org/gitlab-ce!14535
```
  5a23af92
- Update CHANGELOG.md for 9.5.7 · 30886ce6
  Jose Ivan Vargas authored Oct 03, 2017
```
[ci skip]
```
  30886ce6
- Merge branch 'winh-fix-sprintf-eslint' into 'master' · 900a19ed
  Clement Ho authored Oct 03, 2017
```
Fix linting errors in sprintf

See merge request gitlab-org/gitlab-ce!14664
```
  900a19ed
- Fix link to Vue.js style guide · 9ba04545
  Winnie Hellmann authored Oct 03, 2017
  
  9ba04545
- Fix bottom spacing for dropdowns that open upwards · 64a60e08
  Eric Eastwood authored Sep 27, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38315
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38187
```
  64a60e08
- Fix linting errors in sprintf · dae78a55
  Winnie Hellmann authored Oct 03, 2017
  
  dae78a55
- Merge branch '37970-timestamped-ci' into 'master' · da9d42f2
  Kamil Trzciński authored Oct 03, 2017
```
Hide CI section markers from job trace

See merge request gitlab-org/gitlab-ce!14393
```
  da9d42f2
- Merge branch 'add-ci-builds-index-for-jobscontroller' into 'master' · c3462235
  Kamil Trzciński authored Oct 03, 2017
```
Change index on ci_builds to optimize Jobs Controller

See merge request gitlab-org/gitlab-ce!14519
```
  c3462235
- Merge branch 'regression-labeling-with-label' into 'master' · bd970a51
  Victor Wu authored Oct 03, 2017
```
regression with product labels

See merge request gitlab-org/gitlab-ce!14634
```
  bd970a51