Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changelog file added26192-fixes-too-short-input | Nur Rony | 2016-12-29 | 1 | -0/+4 |
| | |||||
* | fixes too short input for placeholder message in commit listing page | Nur Rony | 2016-12-29 | 1 | -0/+6 |
| | |||||
* | Merge branch '26134-ctrl-enter-does-not-submit-a-new-merge-request' into ↵ | Sean McGivern | 2016-12-29 | 2 | -1/+5 |
|\ | | | | | | | | | | | | | | | | | | | 'master' CTRL+Enter does not submit a new merge request Closes #26134 See merge request !8360 | ||||
| * | CTRL+Enter does not submit a new merge request | Saad Shahd | 2016-12-29 | 2 | -1/+5 |
| | | |||||
* | | Merge branch 'issue_25889' into 'master' | Sean McGivern | 2016-12-29 | 2 | -1/+26 |
|\ \ | | | | | | | | | | | | | | | | | | | Revert MattermostNotificationService and SlackNotificationService to MattermostS… Closes #25889 See merge request !8240 | ||||
| * | | Revert MattermostNotificationService and SlackNotificationService to ↵issue_25889 | Felipe Artur | 2016-12-28 | 2 | -1/+26 |
| | | | | | | | | | | | | MattermostService and SlackService | ||||
* | | | Merge branch 'dz-fix-milestones-spec' into 'master' | Dmitriy Zaporozhets | 2016-12-29 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix RoutingError at ./spec/features/milestones/milestones_spec.rb See merge request !8361 | ||||
| * | | | Wait for ajax request to complete when testing milestont drang-n-drop feature | Dmitriy Zaporozhets | 2016-12-29 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'view-ce-vs-ee' into 'master' | Sean McGivern | 2016-12-29 | 4 | -0/+22 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | About GitLab link in sidebar that links to help page Closes #24479 See merge request !8316 | ||||
| * | | | | About GitLab link in sidebar that links to help pageview-ce-vs-ee | victorwu | 2016-12-28 | 4 | -0/+22 |
| | | | | | |||||
* | | | | | Merge branch 'issue_22664' into 'master' | Sean McGivern | 2016-12-29 | 14 | -27/+207 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Check if user can read project before being assigned to issue Closes #22664 See merge request !7980 | ||||
| * | | | | Check if user can read issue before being assignedissue_22664 | Felipe Artur | 2016-12-27 | 14 | -34/+189 |
| | | | | | |||||
| * | | | | Fix issuable assignee update bug when previous assignee is null | Felipe Artur | 2016-12-20 | 3 | -3/+28 |
| | | | | | |||||
* | | | | | Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' | Sean McGivern | 2016-12-29 | 3 | -8/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix unclear closing issue behaviour on Merge Request show page Closes #26152 See merge request !8345 | ||||
| * | | | | add changelog entry | Gabriel Gizotti | 2016-12-29 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ↵ | Gabriel Gizotti | 2016-12-28 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | issues on MergeRequest#issues_mentioned_but_not_closing | ||||
* | | | | | Merge branch 'dz-nested-group-access' into 'master' | Dmitriy Zaporozhets | 2016-12-29 | 5 | -6/+93 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Inherit permissions from parent group See merge request !8071 | ||||
| * | | | | | Improve Group#users_with_parents methoddz-nested-group-access | Dmitriy Zaporozhets | 2016-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Include group parents into read access for project and group | Dmitriy Zaporozhets | 2016-12-26 | 5 | -6/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Merge branch '24941-login-tabs-border' into 'master' | Alfredo Sumaran | 2016-12-28 | 2 | -2/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix left border in session tabs Closes #24941 See merge request !8346 | ||||
| * | | | | | | add CHANGELOG.md entry for !834624941-login-tabs-border | Mike Greiling | 2016-12-28 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | fix left border in session tabs | Mike Greiling | 2016-12-28 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch ↵ | Alfredo Sumaran | 2016-12-28 | 3 | -2/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24820-buttons-in-the-branches-page-are-stacking-on-top-of-each-other-depending-on-the-selected-filter' into 'master' Resolve "Buttons in the "Branches" page are stacking on top of each other depending on the selected filter" Closes #24820 See merge request !8074 | ||||
| * | | | | | | | change chevron position for branch sort order dropdown menu | Mike Greiling | 2016-12-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | add CHANGELOG.md entry for !8074 | Mike Greiling | 2016-12-28 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | fix mobile view for branch index header | Mike Greiling | 2016-12-28 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | allow header buttons to take more than 50% of the screen width | Mike Greiling | 2016-12-28 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch ↵ | Alfredo Sumaran | 2016-12-28 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24876-page-jumps-to-wrong-position-when-clicking-a-comment-anchor' into 'master' Fix instances where clicking a comment anchor twice will scroll to the wrong position Closes #24876 See merge request !8046 | ||||
| * | | | | | | | limit body click selector to tags with a hash target24876-page-jumps-to-wrong-position-when-clicking-a-comment-anchor | Mike Greiling | 2016-12-28 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | don't take for granted that all anchor tags have an href attribute | Mike Greiling | 2016-12-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | add CHANGELOG.md entry for !8046 | Mike Greiling | 2016-12-28 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | move body click binding inside the onready callback | Mike Greiling | 2016-12-28 | 1 | -8/+8 |
| | | | | | | | | |||||
| * | | | | | | | catch instances where hashchange event is not fired yet we still want to ↵ | Mike Greiling | 2016-12-28 | 1 | -0/+8 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | adjust scroll position | ||||
* | | | | | | | 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 |