summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '19035-fix-merge-issue' into 'master'Stan Hu2016-06-241-0/+12
* Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-222-10/+4
* Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz2016-06-211-0/+20
* Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-171-0/+102
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-173-84/+125
* Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-0/+26
* Merge branch '2979-personal-access-tokens' into 'master' Douwe Maan2016-06-171-0/+71
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-152-0/+17
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-122-0/+17
* | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-142-27/+27
* | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-142-6/+6
* | Add request access for groupsRémy Coutable2016-06-142-20/+427
* | Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-131-1/+18
|/
* Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-108-39/+29
|\
| * 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
* | Add send_git_diff helperDouwe Maan2016-06-083-7/+93
|\ \ | |/
| * 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
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-6/+22
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-1/+1
| | |_|/ | |/| |
* | | | Add workhorse controller and API helpersDouwe Maan2016-06-062-2/+5
| |_|/ |/| |
* | | 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 '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
View Lorry Controller Status