summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Remove require_relative 'import_spec_helper'make-omniauth-tests-to-not-modify-global-stateKamil Trzcinski2016-06-086-6/+0
* Move ImportSpecHelper to spec/support/Kamil Trzcinski2016-06-081-33/+0
* Make Omniauth providers specs to not modify global configurationKamil Trzcinski2016-06-081-1/+1
* Fix endless redirections when accessing user OAuth applications when they are...Stan Hu2016-06-081-0/+29
* Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-0/+53
|\
| * Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-071-0/+53
* | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-6/+3
|\ \
| * | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-6/+3
* | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+36
|\ \ \ | | |/ | |/|
| * | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-061-0/+36
| |\ \
| | * | Update tests on wordingZ.J. van de Weg2016-06-061-2/+2
| | * | Backend awardables on commentsZJ van de Weg2016-06-061-0/+36
* | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-8/+32
|\ \ \ \ | |/ / /
| * | | Add a U2F-specific audit log entry after logging in.Timothy Andrew2016-06-061-1/+25
| * | | Implement U2F registration.Timothy Andrew2016-06-061-7/+7
| |/ /
* | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-6/+22
|\ \ \ | |/ /
| * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-034-8/+111
| |\ \ | | |/
| * | Incorportate feedbackZ.J. van de Weg2016-06-012-5/+5
| * | Merge branch 'master' into awardablesZJ van de Weg2016-05-308-10/+21
| |\ \
| * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-253-1/+49
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-185-1/+237
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-101-0/+14
| * | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-6/+6
* | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
| |_|_|/ |/| | |
* | | | 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 '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
|/ / / /
View Lorry Controller Status