summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-07232-1350/+2600
|\
| * Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-12-071-1/+1
| |\
| | * Merge pull request #9892 from stetskevych/fix_nginx_ssl_configJacob Vosmaer2015-12-071-1/+1
| | |\
| | | * Fix gitlab-ssl nginx config to work when multiple server_names are served ove...Vyacheslav Stetskevych2015-12-061-1/+1
| * | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-078-10/+48
| |\ \ \
| | * | | 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-07201-1253/+2168
| | |\ \ \ | | | |/ /
| | * | | sort milestones by due_dateGreg Smethells2015-12-038-11/+49
| * | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-0711-43/+129
| |\ \ \ \
| | * | | | 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
| | * | | | Add feature test for emoji-only diff notesGrzegorz Bizon2015-12-032-0/+23
| | * | | | 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
| | * | | | Add test for award-emoji being added as regular commentGrzegorz Bizon2015-12-032-13/+24
| | * | | | 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-078-6/+36
| |\ \ \ \ \
| | * | | | | Fix spec that broke due to fact that iid is needed, not id, for MilestonesCon...Stan Hu2015-12-051-3/+2
| | * | | | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-057-3/+34
| * | | | | | Merge branch 'style-warning-about-mentioning-many-people-in-a-comment' into '...Douwe Maan2015-12-073-13/+12
| |\ \ \ \ \ \
| | * \ \ \ \ \ 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-04138-660/+943
| | |\ \ \ \ \ \
| | * | | | | | | 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-0399-521/+612
| | |\ \ \ \ \ \ \
| | * | | | | | | | 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-022-9/+10
| * | | | | | | | | Move changelog itemDouwe Maan2015-12-071-1/+1
| * | | | | | | | | Merge branch 'issue_1156'Douwe Maan2015-12-078-29/+218
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Remove changelog entry issue numberDouwe Maan2015-12-071-1/+1
| | * | | | | | | | Raise the exception from #execute instead of #run_hook. #1156 #3069issue_1156Rubén Dávila2015-12-032-13/+15
| | * | | | | | | | Call update hook from new GitHooksService class. #3069Rubén Dávila2015-12-033-10/+19
| | * | | | | | | | Run custom Git hooks when creating or deleting branches through the UI. #1156Rubén Dávila2015-12-038-29/+207
| * | | | | | | | | Merge branch 'fix-gitlab-workhorse-initd-check' into 'master' Stan Hu2015-12-061-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Check GitLab Workhorse status in init.d script when reporting all components ...Stan Hu2015-12-041-1/+1
| * | | | | | | | | | Merge branch 'duplicate_notifications_fix' into 'master' Stan Hu2015-12-063-3/+8
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Fixed duplicated issue note email notifications.Anton Baklanov2015-12-063-3/+8
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #9876 from atomaka/atomaka/feature/project-limit-notifyStan Hu2015-12-057-2/+26
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Notify user if they cannot create projectsAndrew Tomaka2015-12-057-2/+26
| |/ / / / / / / /
| * | | | | | | | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-0442-412/+956
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Satisfy rubocoplink-refsDouwe Maan2015-12-031-1/+1
| | * | | | | | | | Pass original text along with label reference filter.Douwe Maan2015-12-031-1/+5
View Lorry Controller Status