summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Make a few style changes based on MR feedback.Timothy Andrew2016-04-151-2/+2
* Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-1314-74/+271
|\
| * 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
| * | | | | | Merge branch 'api-get-tag' into 'master' Rémy Coutable2016-04-121-0/+17
| |\ \ \ \ \ \
| | * | | | | | Fix minor styling issues from code reviewRobert Schilling2016-04-121-3/+3
| | * | | | | | API: Ability to retrieve a single tagRobert Schilling2016-04-121-0/+17
| * | | | | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687Zeger-Jan van de Weg2016-04-121-3/+17
| | |/ / / / / | |/| | | | |
| * | | | | | API: Add iid filter to milestonesRobert Schilling2016-04-121-3/+5
| |/ / / / /
* | | | | | Fix the rubocop check.Timothy Andrew2016-04-131-2/+3
* | | | | | Test the `Issue#to_branch_name` method.Timothy Andrew2016-04-121-2/+11
* | | | | | Augment the tests for `Issue#related_branches`Timothy Andrew2016-04-121-3/+19
* | | | | | Refactor `Issue#related_branches`Timothy Andrew2016-04-121-1/+2
|/ / / / /
* | | | | Merge branch 'issue_1752' into 'master' Robert Speicher2016-04-111-4/+19
|\ \ \ \ \
| * | | | | improve specs code syntaxissue_1752Felipe Artur2016-04-071-11/+11
| * | | | | Fix milestone removal problem when editing issuesFelipe Artur2016-04-061-0/+15
* | | | | | Merge branch 'dashboard-filter-milestone' into 'master' Jacob Schatz2016-04-111-0/+54
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed issue with dashboard/issues not filtering by milestonedashboard-filter-milestonePhil Hughes2016-04-111-0/+54
* | | | | | Merge branch 'metrics-measure-block-transaction' into 'master' Yorick Peterse2016-04-112-11/+14
|\ \ \ \ \ \
| * | | | | | Fixed stubbing for Gitlab::Metrics specsYorick Peterse2016-04-111-1/+1
| * | | | | | Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transactionYorick Peterse2016-04-111-0/+3
| * | | | | | Added specs for Gitlab::Metrics::System.cpu_timeYorick Peterse2016-04-111-0/+6
| * | | | | | Store block timings as transaction valuesYorick Peterse2016-04-111-11/+5
| |/ / / / /
* | | | | | Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets2016-04-111-0/+46
|\ \ \ \ \ \
| * | | | | | Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-041-0/+46
* | | | | | | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-111-3/+8
|\ \ \ \ \ \ \
| * | | | | | | Build fixPhil Hughes2016-04-061-3/+8
* | | | | | | | Merge branch 'rs-remove-markdown-tips' into 'master' Dmitriy Zaporozhets2016-04-111-7/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove `random_markdown_tip` helperrs-remove-markdown-tipsRobert Speicher2016-04-091-7/+0