Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date' | Douwe Maan | 2015-12-07 | 8 | -10/+48 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Satisfy Rubocop | Douwe Maan | 2015-12-07 | 1 | -1/+1 | |
| * | | | | | | | | | | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-date | Douwe Maan | 2015-12-07 | 201 | -1253/+2168 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | sort milestones by due_date | Greg Smethells | 2015-12-03 | 8 | -11/+49 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' | Grzegorz Bizon | 2015-12-07 | 11 | -43/+129 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notes | Grzegorz Bizon | 2015-12-07 | 1 | -2/+1 | |
| * | | | | | | | | | | Remove space before exclamation mark in award alert | Grzegorz Bizon | 2015-12-05 | 1 | -1/+1 | |
| * | | | | | | | | | | Refactor note awards to reuse `emoji_pattern` and improve validator | Grzegorz Bizon | 2015-12-05 | 1 | -18/+14 | |
| * | | | | | | | | | | Make method `supports_award?` public in `Note` | Grzegorz Bizon | 2015-12-03 | 1 | -2/+2 | |
| * | | | | | | | | | | Combine new javascript Flash methods into one | Grzegorz Bizon | 2015-12-03 | 2 | -7/+3 | |
| * | | | | | | | | | | Support emoji awards also in merge requests | Grzegorz Bizon | 2015-12-03 | 1 | -3/+4 | |
| * | | | | | | | | | | Add feature test for emoji-only diff notes | Grzegorz Bizon | 2015-12-03 | 2 | -0/+23 | |
| * | | | | | | | | | | Pin flash message to top if award note is invalid | Grzegorz Bizon | 2015-12-03 | 1 | -1/+3 | |
| * | | | | | | | | | | Add new features to javascript flash message | Grzegorz Bizon | 2015-12-03 | 2 | -6/+23 | |
| * | | | | | | | | | | Show flash message instead of alert when note is invalid | Grzegorz Bizon | 2015-12-03 | 1 | -1/+2 | |
| * | | | | | | | | | | Add test for award-emoji being added as regular comment | Grzegorz Bizon | 2015-12-03 | 2 | -13/+24 | |
| * | | | | | | | | | | Notify user when award-emoji comment is invalid | Grzegorz Bizon | 2015-12-03 | 2 | -1/+10 | |
| * | | | | | | | | | | Render json message with errors if note didn't pass validation | Grzegorz Bizon | 2015-12-03 | 1 | -10/+14 | |
| * | | | | | | | | | | Scroll to awards after adding emoji-award comment | Grzegorz Bizon | 2015-12-03 | 2 | -1/+7 | |
| * | | | | | | | | | | Move note emoji-award implementation to note model (feature envy) | Grzegorz Bizon | 2015-12-03 | 2 | -24/+33 | |
| * | | | | | | | | | | Support award-emoji notes only when it a comment for an issue | Grzegorz Bizon | 2015-12-03 | 1 | -6/+17 | |
| * | | | | | | | | | | Add validator for award-emoji note | Grzegorz Bizon | 2015-12-03 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge branch 'fix-global-milestones-error-500' into 'master' | Douwe Maan | 2015-12-07 | 8 | -6/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix spec that broke due to fact that iid is needed, not id, for MilestonesCon... | Stan Hu | 2015-12-05 | 1 | -3/+2 | |
| * | | | | | | | | | | | Fix Error 500 when creating global milestones with Unicode characters | Stan Hu | 2015-12-05 | 7 | -3/+34 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'style-warning-about-mentioning-many-people-in-a-comment' into '... | Douwe Maan | 2015-12-07 | 3 | -13/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-co...style-warning-about-mentioning-many-people-in-a-comment | Douglas Barbosa Alexandre | 2015-12-04 | 138 | -660/+943 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix specs | Douglas Barbosa Alexandre | 2015-12-03 | 2 | -3/+2 | |
| * | | | | | | | | | | | Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-co... | Douglas Barbosa Alexandre | 2015-12-03 | 99 | -521/+612 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Improve style of the warning when mentioning many people in a comment | Douglas Barbosa Alexandre | 2015-12-03 | 2 | -12/+11 | |
| * | | | | | | | | | | | | Style warning about mentioning many people in a comment | Douglas Barbosa Alexandre | 2015-12-02 | 2 | -9/+10 | |
* | | | | | | | | | | | | | Move changelog item | Douwe Maan | 2015-12-07 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'issue_1156' | Douwe Maan | 2015-12-07 | 8 | -29/+218 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove changelog entry issue number | Douwe Maan | 2015-12-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Raise the exception from #execute instead of #run_hook. #1156 #3069issue_1156 | Rubén Dávila | 2015-12-03 | 2 | -13/+15 | |
| * | | | | | | | | | | | | Call update hook from new GitHooksService class. #3069 | Rubén Dávila | 2015-12-03 | 3 | -10/+19 | |
| * | | | | | | | | | | | | Run custom Git hooks when creating or deleting branches through the UI. #1156 | Rubén Dávila | 2015-12-03 | 8 | -29/+207 | |
* | | | | | | | | | | | | | Merge branch 'fix-gitlab-workhorse-initd-check' into 'master' | Stan Hu | 2015-12-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Check GitLab Workhorse status in init.d script when reporting all components ... | Stan Hu | 2015-12-04 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'duplicate_notifications_fix' into 'master' | Stan Hu | 2015-12-06 | 3 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fixed duplicated issue note email notifications. | Anton Baklanov | 2015-12-06 | 3 | -3/+8 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #9876 from atomaka/atomaka/feature/project-limit-notify | Stan Hu | 2015-12-05 | 7 | -2/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Notify user if they cannot create projects | Andrew Tomaka | 2015-12-05 | 7 | -2/+26 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'link-refs' into 'master' | Robert Speicher | 2015-12-04 | 42 | -412/+956 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Satisfy rubocoplink-refs | Douwe Maan | 2015-12-03 | 1 | -1/+1 | |
| * | | | | | | | | | | | Pass original text along with label reference filter. | Douwe Maan | 2015-12-03 | 1 | -1/+5 | |
| * | | | | | | | | | | | Use URL helpers in specs | Douwe Maan | 2015-12-03 | 5 | -19/+27 | |
| * | | | | | | | | | | | Merge branch 'master' into link-refs | Douwe Maan | 2015-12-03 | 88 | -348/+380 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Allow invalid URLs in closing pattern | Douwe Maan | 2015-12-02 | 2 | -1/+52 | |
| * | | | | | | | | | | | Merge branch 'master' into link-refs | Douwe Maan | 2015-12-02 | 82 | -597/+792 | |
| |\ \ \ \ \ \ \ \ \ \ \ |