summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'api-star-project' into 'master' Rémy Coutable2016-04-131-0/+48
|\
| * Styling changes to code and docsRobert Schilling2016-04-131-6/+4
| * Make staring API more restfulRobert Schilling2016-04-131-4/+4
| * API: Star and unstar a projectRobert Schilling2016-04-131-0/+50
* | Merge branch 'label-filter' into 'master' Jacob Schatz2016-04-131-0/+31
|\ \
| * | Filtering by any label keeps the text on the toggle buttonlabel-filterPhil Hughes2016-04-121-0/+9
| * | Added label filter testsPhil Hughes2016-04-071-0/+22
* | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-131-9/+28
|\ \ \
| * | | Added default setting for `external_providers`Patricio Cano2016-04-111-9/+28
* | | | Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets2016-04-131-0/+17
|\ \ \ \
| * | | | Add `Gitlab.com?` methodrs-gitlab-com-checkRobert Speicher2016-04-121-0/+17
* | | | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-132-12/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix group_member_spec to not leak informationRobert Schilling2016-04-131-5/+7
| * | | | API: Avoid group leak while updating the groupRobert Schilling2016-04-131-2/+2
| * | | | API: Return 404 if user does not have access to groupRobert Schilling2016-04-131-5/+10
* | | | | Merge branch 'api-move-issues' into 'master' Rémy Coutable2016-04-131-1/+69
|\ \ \ \ \
| * | | | | Update tests for moving issues via APIRobert Schilling2016-04-131-20/+37
| * | | | | API: Ability to move an issueRobert Schilling2016-04-131-1/+52
* | | | | | Added ability to add custom tags to transactionsYorick Peterse2016-04-131-0/+25
|/ / / / /
* | | | | Merge branch 'issue_15044' into 'master' Rémy Coutable2016-04-131-0/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add changelog entry, improve specs and model codeissue_15044Felipe Artur2016-04-121-5/+4
| * | | | Allow to close invalid merge requestFelipe Artur2016-04-111-0/+29
* | | | | Merge branch 'fix-stale-branch-count-cache' into 'master' Yorick Peterse2016-04-131-0/+2
|\ \ \ \ \
| * | | | | Fix repository cache invalidation issue when project is recreated with an emp...Stan Hu2016-04-131-0/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'api-group-visibility' into 'master' Rémy Coutable2016-04-131-0/+44
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix minor issues according development guidelinesRobert Schilling2016-04-121-4/+12
| * | | | API: Ability to update a groupRobert Schilling2016-04-121-0/+36
* | | | | Merge branch 'project-title-dropdown' into 'master' Jacob Schatz2016-04-123-24/+26
|\ \ \ \ \
| * | | | | Updated based on Ruby feedbackPhil Hughes2016-04-121-12/+13
| * | | | | Tests updatePhil Hughes2016-04-122-22/+24
| * | | | | Updated testsPhil Hughes2016-04-121-2/+1
* | | | | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-121-0/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add some changes to the testfix_quick_submit_missing_in_edit_merge_requestArinde Eniola2016-04-071-11/+5
| * | | | | add testArinde Eniola2016-04-071-0/+27
* | | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-125-44/+109
|\ \ \ \ \ \
| * | | | | | Fix specs for Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-28/+0
| * | | | | | Improve specs for group/project notification controllerdecouple-member-notificationDouglas Barbosa Alexandre2016-04-122-3/+53
| * | | | | | Requires user to be signed in when changing notification settingsDouglas Barbosa Alexandre2016-04-112-0/+48
| * | | | | | Reuse `User#notification_settings_for` when it's possibleDouglas Barbosa Alexandre2016-04-111-2/+2
| * | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-118-22/+204
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0862-262/+1581
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Add spec for user_id uniq in NotificationSetting modelDmitriy Zaporozhets2016-03-301-1/+2
| * | | | | | | Refactor notification helper and fix notification serviceDmitriy Zaporozhets2016-03-301-28/+9
| * | | | | | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-302-6/+4
| * | | | | | | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-301-13/+13
| * | | | | | | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-301-0/+15
* | | | | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-122-0/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | Adapt tests to new testing guidelinesRobert Schilling2016-04-122-11/+10
| * | | | | | | | Fix code review issuesRobert Schilling2016-04-122-5/+24
| * | | | | | | | Delete notes via APIRobert Schilling2016-04-122-0/+58
| | |_|_|_|/ / / | |/| | | | | |