summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-034-8/+111
|\
| * Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-031-0/+86
| |\
| | * Don't allow merges with new commitsSean McGivern2016-06-011-0/+86
| * | Update test since branch removal does not render template anymoredz-code-tabDmitriy Zaporozhets2016-06-031-4/+0
| * | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+1
| |\ \ | | |/ | |/|
| | * Fix a broken specConnor Shea2016-05-301-1/+1
| * | Merge branch 'rs-remember-me-2fa' into 'master' Douwe Maan2016-06-011-0/+21
| |\ \
| | * | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-301-0/+21
| | |/
| * | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-011-2/+2
| |\ \ | | |/ | |/|
| | * Update tests for the current_application_settings request store changesDJ Mountney2016-05-271-2/+2
| * | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
* | | Incorportate feedbackZ.J. van de Weg2016-06-012-5/+5
* | | Merge branch 'master' into awardablesZJ van de Weg2016-05-308-10/+21
|\ \ \ | |/ /
| * | Project#show on projects pending deletion will 404zj-race-condition-pending-deleteZeger-Jan van de Weg2016-05-281-0/+11
| |/
| * Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-247-10/+10
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-253-1/+49
|\ \ | |/
| * Enable Style/SpaceAroundKeyword cop and fix offensesRobert Speicher2016-05-231-1/+1
| * Merge branch 'issue_9013' into 'master' Douwe Maan2016-05-202-0/+48
| |\
| | * Use the right default notification settings for non membersissue_9013Felipe Artur2016-05-191-3/+4
| | * Let users set notification levels in projects which they are not membersFelipe Artur2016-05-172-1/+48
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-185-1/+237
|\ \ \ | |/ /
| * | Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-181-1/+1
| |\ \ | | |/ | |/|
| | * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-161-1/+1
| * | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+33
| |\ \
| | * | Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-161-1/+1
| | * | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-161-6/+6
| | * | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+33
| * | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-161-0/+76
| |/ /
| * | 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
| |/ /
* | | Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-121-2/+4
* | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-3/+3
* | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1111-29/+345
|\ \ \ | |/ /
| * | 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
View Lorry Controller Status