Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add `Gitlab.com?` methodrs-gitlab-com-check | Robert Speicher | 2016-04-12 | 1 | -0/+17 |
* | Merge branch 'project-title-dropdown' into 'master' | Jacob Schatz | 2016-04-12 | 3 | -24/+26 |
|\ | |||||
| * | Updated based on Ruby feedback | Phil Hughes | 2016-04-12 | 1 | -12/+13 |
| * | Tests update | Phil Hughes | 2016-04-12 | 2 | -22/+24 |
| * | Updated tests | Phil Hughes | 2016-04-12 | 1 | -2/+1 |
* | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' | Jacob Schatz | 2016-04-12 | 1 | -0/+21 |
|\ \ | |/ |/| | |||||
| * | add some changes to the testfix_quick_submit_missing_in_edit_merge_request | Arinde Eniola | 2016-04-07 | 1 | -11/+5 |
| * | add test | Arinde Eniola | 2016-04-07 | 1 | -0/+27 |
* | | Merge branch 'decouple-member-notification' into 'master' | Douwe Maan | 2016-04-12 | 5 | -44/+109 |
|\ \ | |||||
| * | | Fix specs for Projects::NotificationSettingsController | Douglas Barbosa Alexandre | 2016-04-12 | 1 | -28/+0 |
| * | | Improve specs for group/project notification controllerdecouple-member-notification | Douglas Barbosa Alexandre | 2016-04-12 | 2 | -3/+53 |
| * | | Requires user to be signed in when changing notification settings | Douglas Barbosa Alexandre | 2016-04-11 | 2 | -0/+48 |
| * | | Reuse `User#notification_settings_for` when it's possible | Douglas Barbosa Alexandre | 2016-04-11 | 1 | -2/+2 |
| * | | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-11 | 8 | -22/+204 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-08 | 62 | -262/+1581 |
| |\ \ \ | |||||
| * | | | | Add spec for user_id uniq in NotificationSetting model | Dmitriy Zaporozhets | 2016-03-30 | 1 | -1/+2 |
| * | | | | Refactor notification helper and fix notification service | Dmitriy Zaporozhets | 2016-03-30 | 1 | -28/+9 |
| * | | | | Small refactoring and cleanup of notification logic | Dmitriy Zaporozhets | 2016-03-30 | 2 | -6/+4 |
| * | | | | Update NotificationService to use NotificationSettings instead of membership | Dmitriy Zaporozhets | 2016-03-30 | 1 | -13/+13 |
| * | | | | Introduce NotificationSetting model | Dmitriy Zaporozhets | 2016-03-30 | 1 | -0/+15 |
* | | | | | Merge branch 'api-delete-note' into 'master' | Rémy Coutable | 2016-04-12 | 2 | -0/+76 |
|\ \ \ \ \ | |||||
| * | | | | | Adapt tests to new testing guidelines | Robert Schilling | 2016-04-12 | 2 | -11/+10 |
| * | | | | | Fix code review issues | Robert Schilling | 2016-04-12 | 2 | -5/+24 |
| * | | | | | Delete notes via API | Robert Schilling | 2016-04-12 | 2 | -0/+58 |
* | | | | | | Merge branch 'api-get-tag' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix minor styling issues from code review | Robert Schilling | 2016-04-12 | 1 | -3/+3 |
| * | | | | | | API: Ability to retrieve a single tag | Robert Schilling | 2016-04-12 | 1 | -0/+17 |
* | | | | | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687 | Zeger-Jan van de Weg | 2016-04-12 | 1 | -3/+17 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | API: Add iid filter to milestones | Robert Schilling | 2016-04-12 | 1 | -3/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'issue_1752' into 'master' | Robert Speicher | 2016-04-11 | 1 | -4/+19 |
|\ \ \ \ \ | |||||
| * | | | | | improve specs code syntaxissue_1752 | Felipe Artur | 2016-04-07 | 1 | -11/+11 |
| * | | | | | Fix milestone removal problem when editing issues | Felipe Artur | 2016-04-06 | 1 | -0/+15 |
* | | | | | | Merge branch 'dashboard-filter-milestone' into 'master' | Jacob Schatz | 2016-04-11 | 1 | -0/+54 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fixed issue with dashboard/issues not filtering by milestonedashboard-filter-milestone | Phil Hughes | 2016-04-11 | 1 | -0/+54 |
* | | | | | | Merge branch 'metrics-measure-block-transaction' into 'master' | Yorick Peterse | 2016-04-11 | 2 | -11/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed stubbing for Gitlab::Metrics specs | Yorick Peterse | 2016-04-11 | 1 | -1/+1 |
| * | | | | | | Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transaction | Yorick Peterse | 2016-04-11 | 1 | -0/+3 |
| * | | | | | | Added specs for Gitlab::Metrics::System.cpu_time | Yorick Peterse | 2016-04-11 | 1 | -0/+6 |
| * | | | | | | Store block timings as transaction values | Yorick Peterse | 2016-04-11 | 1 | -11/+5 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs-form_errors' into 'master' | Dmitriy Zaporozhets | 2016-04-11 | 1 | -0/+46 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Standardize the way we check for and display form errorsrs-form_errors | Robert Speicher | 2016-04-04 | 1 | -0/+46 |
* | | | | | | | Merge branch 'mr-ui-update' into 'master' | Jacob Schatz | 2016-04-11 | 1 | -3/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Build fix | Phil Hughes | 2016-04-06 | 1 | -3/+8 |
* | | | | | | | | Merge branch 'rs-remove-markdown-tips' into 'master' | Dmitriy Zaporozhets | 2016-04-11 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove `random_markdown_tip` helperrs-remove-markdown-tips | Robert Speicher | 2016-04-09 | 1 | -7/+0 |
* | | | | | | | | write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emoji | Arinde Eniola | 2016-04-09 | 1 | -0/+64 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '14400-diff-redesign' into 'master' | Jacob Schatz | 2016-04-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Diff design updates | Annabel Dunstone | 2016-04-07 | 1 | -1/+1 |
| * | | | | | | | Update diff colors and icons | Annabel Dunstone | 2016-04-07 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Instrument Rails cache codeinstrument-rails-cache | Yorick Peterse | 2016-04-08 | 1 | -0/+71 |
|/ / / / / / |