summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-173-84/+125
|\
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-171-0/+71
| |\
| * \ Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-173-103/+125
| |\ \
| | * | Re-use notifications dropdown on user profileFelipe Artur2016-06-163-103/+125
| | * | Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-0/+19
| * | | Implement custom notification level optionsFelipe Artur2016-06-151-0/+19
* | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-181-0/+102
|\ \ \ \
| * | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-86/+80
| * | | | Added todo controller tests for merge requestsPhil Hughes2016-06-171-37/+90
| * | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-0/+13
| * | | | Improved manual todosPhil Hughes2016-06-171-0/+42
| |/ / /
* | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-0/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlinkPatricio Cano2016-06-141-4/+2
| * | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-0/+28
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-165-21/+462
|\ \ \ \ | | |/ / | |/| |
| * | | 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 remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-143-3/+6
|\ \ | |/
| * Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-108-39/+29
| |\
| * \ Add send_git_diff helperDouwe Maan2016-06-083-7/+93
| |\ \
| * | | Add workhorse controller and API helpersDouwe Maan2016-06-062-2/+5
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-107-39/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-099-24/+261
|\ \ \ \ | |/ / /
| * | | 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
View Lorry Controller Status