summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-077-10/+47
|\
| * Satisfy RubocopDouwe Maan2015-12-071-1/+1
| * Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-07143-827/+1062
| |\
| * | sort milestones by due_dateGreg Smethells2015-12-037-11/+48
* | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-077-30/+82
|\ \ \
| * | | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notesGrzegorz Bizon2015-12-071-2/+1
| * | | Remove space before exclamation mark in award alertGrzegorz Bizon2015-12-051-1/+1
| * | | Refactor note awards to reuse `emoji_pattern` and improve validatorGrzegorz Bizon2015-12-051-18/+14
| * | | Make method `supports_award?` public in `Note`Grzegorz Bizon2015-12-031-2/+2
| * | | Combine new javascript Flash methods into oneGrzegorz Bizon2015-12-032-7/+3
| * | | Support emoji awards also in merge requestsGrzegorz Bizon2015-12-031-3/+4
| * | | Pin flash message to top if award note is invalidGrzegorz Bizon2015-12-031-1/+3
| * | | Add new features to javascript flash messageGrzegorz Bizon2015-12-032-6/+23
| * | | Show flash message instead of alert when note is invalidGrzegorz Bizon2015-12-031-1/+2
| * | | Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-032-1/+10
| * | | Render json message with errors if note didn't pass validationGrzegorz Bizon2015-12-031-10/+14
| * | | Scroll to awards after adding emoji-award commentGrzegorz Bizon2015-12-032-1/+7
| * | | Move note emoji-award implementation to note model (feature envy)Grzegorz Bizon2015-12-032-24/+33
| * | | Support award-emoji notes only when it a comment for an issueGrzegorz Bizon2015-12-031-6/+17
| * | | Add validator for award-emoji noteGrzegorz Bizon2015-12-031-0/+1
* | | | Merge branch 'fix-global-milestones-error-500' into 'master' Douwe Maan2015-12-072-2/+2
|\ \ \ \
| * | | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-052-2/+2
* | | | | Merge branch 'style-warning-about-mentioning-many-people-in-a-comment' into '...Douwe Maan2015-12-072-13/+11
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-co...style-warning-about-mentioning-many-people-in-a-commentDouglas Barbosa Alexandre2015-12-04114-604/+667
| |\ \ \ \ \
| * | | | | | Fix specsDouglas Barbosa Alexandre2015-12-032-3/+2
| * | | | | | Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-co...Douglas Barbosa Alexandre2015-12-0386-474/+524
| |\ \ \ \ \ \
| * | | | | | | Improve style of the warning when mentioning many people in a commentDouglas Barbosa Alexandre2015-12-032-12/+11
| * | | | | | | Style warning about mentioning many people in a commentDouglas Barbosa Alexandre2015-12-021-9/+9
* | | | | | | | Merge branch 'issue_1156'Douwe Maan2015-12-075-29/+64
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Raise the exception from #execute instead of #run_hook. #1156 #3069issue_1156Rubén Dávila2015-12-031-11/+9
| * | | | | | | Call update hook from new GitHooksService class. #3069Rubén Dávila2015-12-031-3/+1
| * | | | | | | Run custom Git hooks when creating or deleting branches through the UI. #1156Rubén Dávila2015-12-035-29/+68
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fixed duplicated issue note email notifications.Anton Baklanov2015-12-061-0/+1
* | | | | | | Notify user if they cannot create projectsAndrew Tomaka2015-12-055-1/+19
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-0411-47/+143
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'master' into link-refsDouwe Maan2015-12-0375-299/+291
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into link-refsDouwe Maan2015-12-0217-47/+80
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Satisfy RubocopDouwe Maan2015-12-021-1/+1
| * | | | | Fix referenced_mentionables method.Douwe Maan2015-12-011-1/+1
| * | | | | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-015-25/+10
| * | | | | Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-013-0/+20
| * | | | | Fix code docsDouwe Maan2015-12-011-5/+2
| * | | | | Fix specsDouwe Maan2015-11-301-3/+8
| * | | | | Recognize commit range with named refs in compare URLs.Douwe Maan2015-11-301-12/+19
| * | | | | Proper cross-project references when MR is closed by issueDouwe Maan2015-11-301-1/+1
| * | | | | Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-306-12/+66
| * | | | | Render commit range reference with short shas, link to full shas.Douwe Maan2015-11-301-25/+45
| * | | | | Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan2015-11-304-4/+12
* | | | | | Merge branch 'issue_3583' into 'master' Dmitriy Zaporozhets2015-12-044-6/+9
|\ \ \ \ \ \
| * | | | | | Ensure "Remove Source Branch" button is not shown when branch is being delete...Rubén Dávila2015-12-044-6/+9
View Lorry Controller Status