summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'health-check-route'Douwe Maan2016-05-121-0/+105
|\
| * Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-111-0/+15
| * Add tests for the health check featureDJ Mountney2016-05-101-0/+90
* | Add specs for user routing and update spec for user controllerLong Nguyen2016-05-081-0/+22
|/
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-023-20/+143
|\
| * Fix typoDouwe Maan2016-04-221-1/+1
| * Fix issue with impersonationDouwe Maan2016-04-223-20/+143
* | Handle issue move access instead of raising errorfix/handle-issue-move-accessGrzegorz Bizon2016-04-301-0/+39
* | Backport GitHub Enterprise import support from EEStan Hu2016-04-261-0/+2
|/
* Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-8/+0
|\
| * Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-8/+0
* | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-211-0/+16
|\ \
| * | Add changelog entry and fix convention in a specissue_5838Felipe Artur2016-04-201-1/+1
| * | Projects members tab should follow visibility levelsFelipe Artur2016-04-181-13/+2
| * | Show project members only for membersFelipe Artur2016-04-181-0/+27
* | | Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-191-0/+51
|\ \ \
| * | | Add support to cherry-pick any commitP.S.V.R2016-04-181-0/+51
* | | | Check permissions when sharing project with groupGrzegorz Bizon2016-04-191-0/+50
| |/ / |/| |
* | | Remove group members checkFelipe Artur2016-04-181-3/+5
* | | Insert users check into apiFelipe Artur2016-04-181-2/+0
* | | Code fixesFelipe Artur2016-04-181-1/+1
* | | Fix specsFelipe Artur2016-04-181-1/+3
* | | Fix codeFelipe Artur2016-04-182-3/+3
* | | Add specs and fix codeFelipe Artur2016-04-182-0/+41
|/ /
* | Merge branch 'assign-to-issuable-opener' into 'master' Jacob Schatz2016-04-151-2/+22
|\ \
| * \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-153-2/+80
| |\ \
| * \ \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-052-13/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-03-2920-145/+673
| |\ \ \ \
| * | | | | Revert authors ability to assign anyoneZeger-Jan van de Weg2016-02-221-2/+2
| * | | | | Issuable can be assigned to authorZeger-Jan van de Weg2016-02-221-0/+13
* | | | | | Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable2016-04-151-1/+11
| |_|_|_|/ |/| | | |
* | | | | 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
* | | | | | 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
|/ / / / /
* | | | | Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-071-0/+6
|\ \ \ \ \
| * | | | | Implement review suggestionsFelipe Artur2016-04-071-1/+1
| * | | | | Improve codeFelipe Artur2016-04-051-1/+1
| * | | | | Fix problem when creating milestones in groups without projectsFelipe Artur2016-04-051-0/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix/2fa-authentication-spoofing' into 'master' Rémy Coutable2016-04-071-0/+101
|\ \ \ \ \
| * | | | | Make sessions controller specs more explicitGrzegorz Bizon2016-04-071-4/+5
| * | | | | Fix 2FA authentication spoofing vulnerabilityGrzegorz Bizon2016-04-071-35/+42
| * | | | | Add specs for sessions controller including 2FAGrzegorz Bizon2016-04-061-0/+93
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix_14638' into 'master' Rémy Coutable2016-04-071-0/+23
|\ \ \ \ \
| * | | | | Fixes #14638.PotHix2016-04-061-0/+23
| |/ / / /
* | | | | Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-061-0/+14
|/ / / /
* | | | Merge branch 'fix-project-path-rename' into 'master' Stan Hu2016-04-051-0/+22
|\ \ \ \
| * | | | Fix Error 500 after renaming a project pathStan Hu2016-04-051-0/+22
| |/ / /