Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix MR versions spec25996-Move-award-emoji-out-of-the-discussion-tab-for-MR | Annabel Dunstone Gray | 2016-12-29 | 1 | -2/+2 |
| | |||||
* | Move award emoji's out of the discussion tab for merge requests | dimitrieh | 2016-12-28 | 2 | -3/+7 |
| | |||||
* | Merge branch 'gfm-new-line-fix' into 'master' | Fatih Acet | 2016-12-28 | 3 | -1/+17 |
|\ | | | | | | | | | | | | | Fix GFM dropdown not showing at beginning of new lines Closes #26145 See merge request !8338 | ||||
| * | Fix GFM dropdown not showing at beginning of new linesgfm-new-line-fix | Phil Hughes | 2016-12-28 | 3 | -1/+17 |
| | | | | | | | | Closes #26145 | ||||
* | | Merge branch '26153-refactor-line-length' into 'master' | Fatih Acet | 2016-12-28 | 2 | -49/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | Refactor line length css Closes #26153 See merge request !8354 | ||||
| * | | Refactor line length css | Annabel Dunstone Gray | 2016-12-28 | 2 | -49/+4 |
| | | | |||||
* | | | Merge branch ↵ | Fatih Acet | 2016-12-28 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tooltips' into 'master' Defer tooltip update on Resolve Comment button after DOM cycle Closes #25957 See merge request !8335 | ||||
| * | | | Defer tooltip update on Resolve Comment button after DOM cycle | Sam Rose | 2016-12-28 | 1 | -4/+6 |
| | | | | |||||
* | | | | Merge branch '25430-make-colors-in-runner-status-more-colorblind-friendly' ↵ | Annabel Dunstone Gray | 2016-12-28 | 2 | -3/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Change status colors of runners to better defaults Closes #25430 See merge request !8334 | ||||
| * | | | | Change status colors of runners to better defaults25430-make-colors-in-runner-status-more-colorblind-friendly | dimitrieh | 2016-12-27 | 2 | -3/+7 |
| | | | | | |||||
* | | | | | Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master' | Sean McGivern | 2016-12-28 | 2 | -14/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace link to Resolve conflicts with buttons Closes #21135 See merge request !8229 | ||||
| * | | | | | Replace link to Resolve conflicts with buttons21135-resolve-these-conflicts-link-is-too-subtle | Sam Rose | 2016-12-28 | 2 | -14/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Use variables for display logic conditional checks | ||||
* | | | | | | Merge branch 'fix-non-iife-classes' into 'master' | Alfredo Sumaran | 2016-12-28 | 10 | -1/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure javascript classes declared outside an IIFE are properties of window See merge request !8080 | ||||
| * | | | | | | ensure classes declared outside an IIFE are properties of windowfix-non-iife-classes | Mike Greiling | 2016-12-14 | 10 | -1/+21 |
| | | | | | | | |||||
* | | | | | | | Merge branch '19988-prevent-empty-pagination-when-list-not-empty' into 'master' | Douwe Maan | 2016-12-28 | 9 | -2/+125 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds kaminari_pagination controller concern with bounded pagination to not displ… Closes #19988 See merge request !8172 | ||||
| * | | | | | | | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-empty | Tiago Botelho | 2016-12-23 | 7 | -11/+13 |
| | | | | | | | | |||||
| * | | | | | | | adds specs for respective behaviour | Tiago Botelho | 2016-12-21 | 9 | -19/+123 |
| | | | | | | | | |||||
| * | | | | | | | Prevent empty pagination when list is not empty | Tiago Botelho | 2016-12-21 | 6 | -4/+21 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'fix-light-hr-in-descriptions' into 'master' | Annabel Dunstone Gray | 2016-12-28 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | darkened hr border color in descriptions because of update of bootstrap See merge request !8333 | ||||
| * | | | | | | | | changelog entryfix-light-hr-in-descriptions | dimitrieh | 2016-12-27 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | darkened hr border color in descriptions because of update of bootstrap | dimitrieh | 2016-12-27 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'clean-api-params' into 'master' | Sean McGivern | 2016-12-28 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameter already enforced via grape See merge request !8344 | ||||
| * | | | | | | | | | Parameter already enforced via grapeclean-api-params | Robert Schilling | 2016-12-28 | 1 | -2/+0 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dz-improve-admin-group-routing' into 'master' | Sean McGivern | 2016-12-28 | 3 | -3/+13 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when visit group from admin area if group name contains dot See merge request !8342 | ||||
| * | | | | | | | | | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routing | Dmitriy Zaporozhets | 2016-12-28 | 3 | -3/+13 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | | Merge branch '26126-cache-even-when-no-projects' into 'master' | Yorick Peterse | 2016-12-28 | 3 | -7/+36 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache project authorizations even when user has access to zero projects Closes #26126 See merge request !8327 | ||||
| * | | | | | | | | | Cache project authorizations even when user has access to zero projects26126-cache-even-when-no-projects | Adam Niedzielski | 2016-12-28 | 3 | -7/+36 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-admin-group-page' into 'master' | Sean McGivern | 2016-12-28 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Admin group show page does not work Closes #26147 See merge request !8339 | ||||
| * | | | | | | | | | Fix: Admin group show page does not workfix-admin-group-page | Valery Sizov | 2016-12-28 | 2 | -1/+11 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ux-guide-color-update' into 'master' | Annabel Dunstone Gray | 2016-12-28 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UX Guide: split state and action guidance for color See merge request !8204 | ||||
| * | | | | | | | | | [ci skip] UX Guide: split state and action guidance for colorux-guide-color-update | Allison Whilden | 2016-12-22 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] UX Guide: Add retry to blue | ||||
* | | | | | | | | | | Merge branch 'ux-guide-scroll-animation' into 'master' | Annabel Dunstone Gray | 2016-12-28 | 3 | -1/+16 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UX Guide: add moving transition animation guidance See merge request !8147 | ||||
| * | | | | | | | | | [ci skip] UX Guide: add moving transition animation guidanceux-guide-scroll-animation | Allison Whilden | 2016-12-16 | 3 | -1/+16 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'up-for-grabs-process' into 'master' | Sean McGivern | 2016-12-28 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "up-for-grabs" label from PROCESS.md See merge request !8341 | ||||
| * | | | | | | | | | | Remove "up-for-grabs" label from PROCESS.md | Adam Niedzielski | 2016-12-28 | 1 | -1/+2 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mrchrisw-set-SIDEKIQ_LOG_ARGUMENTS' into 'master' | Sean McGivern | 2016-12-28 | 1 | -5/+8 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set SIDEKIQ_LOG_ARGUMENTS in gitlab.rb See merge request !8340 | ||||
| * | | | | | | | | | Set SIDEKIQ_LOG_ARGUMENTS in gitlab.rb | Chris Wilson | 2016-12-28 | 1 | -5/+8 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix/mentioned-issue-text-grammar' into 'master' | Sean McGivern | 2016-12-28 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar error in text about mentioned issues See merge request !8337 | ||||
| * | | | | | | | | | Add changelog for typo fix in merge request widgetfix/mentioned-issue-text-grammar | Grzegorz Bizon | 2016-12-28 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix grammar error in text about mentioned issues | Grzegorz Bizon | 2016-12-28 | 2 | -3/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix-api-deprecation' into 'master' | Robert Schilling | 2016-12-28 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a Grape deprecation, use `#request_method` instead of `#route_method` See merge request !8297 | ||||
| * | | | | | | | | | Fix a Grape deprecation, use `#request_method` instead of `#route_method`fix-api-deprecation | Rémy Coutable | 2016-12-23 | 3 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | | Update CHANGELOG.md for 8.15.2 | Marin Jankovski | 2016-12-28 | 1 | -0/+1 |
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | | Merge branch 'mrchrisw-update-vmstat' into 'master' | Stan Hu | 2016-12-28 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vmstat to version 2.3.0 Closes #26114 See merge request !8318 | ||||
| * | | | | | | | | | Update vmstat to version 2.3.0mrchrisw-update-vmstat | Chris Wilson | 2016-12-27 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/26114 vmstat 2.3.0 fixes an issue with reporting the incorrect # of CPUs. This is used in the GitLab Admin Dashboard. | ||||
* | | | | | | | | | | Merge branch '25364-fix-preview-multi-request' into 'master' | Alfredo Sumaran | 2016-12-27 | 1 | -60/+55 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clicking markdown 'Preview' tab spawns two XHR requests" Closes #25364 See merge request !8031 | ||||
| * | | | | | | | | | | move check for preview loading class to top of method25364-fix-preview-multi-request | Mike Greiling | 2016-12-27 | 1 | -2/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove preview markdown ajax trigger on textarea blur | Mike Greiling | 2016-12-27 | 1 | -7/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | fix some more eslint rules | Mike Greiling | 2016-12-27 | 1 | -6/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | fix some eslint rules | Mike Greiling | 2016-12-27 | 1 | -19/+18 |
| | | | | | | | | | | |