summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'restrict-failed-2fa-attempts' into 'master' Rémy Coutable2016-10-041-0/+38
|\
| * Restrict failed login attempts for users with 2FASean McGivern2016-10-041-0/+38
* | Merge branch 'zj-save-environment-deployment-refs' into 'master' Kamil Trzciński2016-10-041-0/+10
|\ \
| * | deployment refs in own folder, new method for creating refszj-save-environment-deployment-refsZ.J. van de Weg2016-10-041-0/+10
* | | Merge branch 'issue_22446' into 'master' Sean McGivern2016-10-042-0/+60
|\ \ \
| * \ \ Merge branch 'master' into issue_22446Sean McGivern2016-10-041-0/+17
| |\ \ \ | | | |/ | | |/|
| * | | Fix bug when trying to cache closed issues from external issue trackersissue_22446Felipe Artur2016-10-032-0/+60
| | |/ | |/|
* | | Merge branch 'cleanup-mentionable-methods-arguments' into 'master' Douwe Maan2016-10-043-9/+19
|\ \ \
| * | | Simplify Mentionable concern instance methodsPaco Guzman2016-10-043-9/+19
| |/ /
* | | Merge branch 'rc-improve-members-destroy-service' into 'master' Robert Speicher2016-10-044-43/+94
|\ \ \
| * | | Invert method's namingRémy Coutable2016-10-031-1/+1
| * | | Fix a few things after the initial improvment to Members::DestroyServiceRémy Coutable2016-10-033-4/+13
| * | | Improve Members::DestroyServiceRémy Coutable2016-10-032-42/+84
* | | | Merge branch 'append-issue-template' into 'master' Fatih Acet2016-10-041-5/+25
|\ \ \ \
| * | | | Append issue template to existing descriptionJoseph Frazier2016-10-031-5/+25
| | |/ / | |/| |
* | | | Merge branch 'todo-issue-due-date' into 'master' Robert Speicher2016-10-041-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added test for due datePhil Hughes2016-10-031-1/+7
* | | | Fix issues importing services via Import/ExportJames Lopez2016-10-041-0/+17
| |/ / |/| |
* | | Merge branch 'rs-string-conversion-in-interpolation' into 'master' Rémy Coutable2016-10-034-4/+4
|\ \ \ | |_|/ |/| |
| * | Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-034-4/+4
* | | Merge branch 'master' into 'master' Rémy Coutable2016-10-035-20/+20
|\ \ \
| * | | Changed Slack service user referencing from full name to usernamesecustor2016-10-035-20/+20
* | | | Merge branch 'add-email-subject-suffix' into 'master' Rémy Coutable2016-10-032-1/+12
|\ \ \ \
| * | | | override subject method in devise mailerFu Xu2016-10-031-1/+2
| * | | | follow the styleguide: Don't use parentheses around a literalFu Xu2016-10-031-1/+1
| * | | | move spec back into shared example `an email sent from GitLab`Fu Xu2016-10-032-7/+10
| * | | | stub config settings in specFu Xu2016-10-031-5/+2
| * | | | remove empty line at block body endFu Xu2016-10-031-1/+0
| * | | | create new test in `spec/mailers/notify_spec.rb`Fu Xu2016-10-032-4/+11
| * | | | add configurable email subject suffixFu Xu2016-10-031-0/+4
| | |_|/ | |/| |
* | | | Merge branch '22466-task-list-fork' into 'master' Rémy Coutable2016-10-031-16/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove the task_list test since it is patched upstreamJared Deckard2016-09-301-16/+0
* | | | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-031-2/+2
|\ \ \ \
| * | | | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-031-2/+2
| | |/ / | |/| |
* | | | Merge branch 'rs-convert-ssh-key-features' into 'master' Robert Speicher2016-10-031-4/+43
|\ \ \ \
| * | | | Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-featuresRobert Speicher2016-10-031-4/+43
| |/ / /
* | | | Merge branch '21225-wip-slash-command-for-mrs' into 'master' Rémy Coutable2016-10-035-5/+141
|\ \ \ \ | |/ / / |/| | |
| * | | Add a /wip slash commandThomas Balthazar2016-10-035-5/+141
* | | | Members::RequestAccessService is tricter on permissionsRémy Coutable2016-10-032-3/+3
|/ / /
* | | Merge branch '22773-add-comparison-link-to-system-note' into 'master' Dmitriy Zaporozhets2016-10-032-6/+19
|\ \ \ | |_|/ |/| |
| * | Remove duplicate testMatthewRDodds/gitlab-ce-22773-add-comparison-link-to-system-noteMatthew Dodds2016-10-011-4/+0
| * | Add a spec to verify comparison context inclusion in path when a version is c...Matthew Dodds2016-10-011-2/+13
| * | Refactor url_helpers for system note service and remove duplication of logic ...Matthew Dodds2016-09-301-13/+5
| * | Add link to comparison from system note, update changelogMatthew Dodds2016-09-291-3/+17
* | | Merge branch 'jimmykarily/gitlab-ce-notify_current_user_when_merging_an_mr_af...Robert Speicher2016-10-021-0/+14
|\ \ \
| * | | Notify current_user about automatic merge after successful buildDimitris Karakasilis2016-09-291-0/+14
| |/ /
* | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-0216-121/+312
|\ \ \
| * | | Allow Member.add_user to handle access requestersRémy Coutable2016-09-2816-121/+312
* | | | Merge branch 'rc-new-members-request-access-service' into 'master' Robert Speicher2016-10-027-10/+81
|\ \ \ \
| * | | | Re-add the AccessRequestable concernRémy Coutable2016-09-223-15/+40
View Lorry Controller Status