summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Import from Github using Personal Access Tokens.Eric K Idema2016-06-301-0/+43
* Merge branch 'master' into issue_3359_3issue_3359_3Felipe Artur2016-06-2929-146/+186
|\
| * Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-15/+3
| |\
| | * Workhorse to serve email diffsZ.J. van de Weg2016-06-281-15/+3
| * | Use HTTP matchers if possibleZ.J. van de Weg2016-06-2728-131/+131
| |/
| * Merge branch 'issue_19096' into 'master' Stan Hu2016-06-251-0/+40
| |\
| | * Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-241-0/+40
| * | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-0/+12
| |/
* | merge master into issue_3359_3Felipe Artur2016-06-291-6/+6
|\ \
| * | Insert notification settings dropdown into groupsFelipe Artur2016-06-221-14/+55
* | | merge master into issue_3359_3Felipe Artur2016-06-229-21/+675
|\ \ \ | | |/ | |/|
| * | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-222-10/+4
| |\ \
| | * | Fix and remove duplicate specs18755-fix-destroy-project-causes-post_decline_request-to-be-executedRémy Coutable2016-06-202-8/+2
| | * | Redirect to the member's source on request withdrawalRémy Coutable2016-06-182-2/+2
| * | | Fixed issue with returning ref in commits JSONasync-refs-dropdownPhil Hughes2016-06-201-0/+20
| |/ /
| * | 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
| | |\ \ \ | | | | |/ | | | |/|
| | * | | 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 remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-107-39/+0
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-099-24/+261
| |\ \ \ \
| * | | | | Fix rubocop spec.Timothy Andrew2016-06-031-4/+4
| * | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0314-13/+329
| |\ \ \ \ \
| * | | | | | Parts of spec names with "when" should be contexts.Timothy Andrew2016-06-031-18/+27
| * | | | | | Perform private token and personal access token authentication in the same `b...Timothy Andrew2016-06-011-45/+47
| * | | | | | Reuse the private token param and header for personal access tokens.Timothy Andrew2016-05-111-3/+3
| * | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-05-114-20/+182
| |\ \ \ \ \ \
| * | | | | | | Address @DouweM's feedback on !3749.Timothy Andrew2016-04-281-6/+0
| * | | | | | | Authenticate non-API requests with personal access tokens.Timothy Andrew2016-04-281-0/+66
* | | | | | | | Insert notification settings dropdown into groupsFelipe Artur2016-06-221-14/+55
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
View Lorry Controller Status