summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-042-0/+4
* Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-042-3/+3
|\
| * API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-292-3/+3
* | Merge branch 'rs-unique-signup-fields' into 'master' Douwe Maan2016-05-041-0/+7
|\ \
| * | Improve uniqueness of field names on the signup formrs-unique-signup-fieldsRobert Speicher2016-04-191-0/+7
* | | Use sign out path only if not emptyArtem Sidorenko2016-05-031-1/+1
* | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-024-45/+41
|\ \ \
| * | | Store original user in variableDouwe Maan2016-04-221-2/+2
| * | | Remove unused methodDouwe Maan2016-04-221-4/+0
| * | | Fix issue with impersonationDouwe Maan2016-04-224-45/+45
* | | | Merge branch '15527-fix-wiki-page-creation-issue' into 'master' Robert Speicher2016-05-021-2/+2
|\ \ \ \
| * | | | Fix error when trying to create a wiki pageRémy Coutable2016-04-291-2/+2
* | | | | Merge branch 'feature/backport-safewebhooks' into 'master' Robert Speicher2016-05-022-4/+18
|\ \ \ \ \
| * | | | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-022-4/+18
| |/ / / /
* | | | | Handle issue move access instead of raising errorfix/handle-issue-move-accessGrzegorz Bizon2016-04-301-0/+2
|/ / / /
* | | | Merge branch 'async-new-branch-button' into 'master' Jacob Schatz2016-04-281-2/+14
|\ \ \ \
| * | | | Load the "New Branch" button asynchronouslyYorick Peterse2016-04-281-2/+14
| | |_|/ | |/| |
* | | | Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz2016-04-281-13/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Project deploy keys updated UIPhil Hughes2016-04-251-13/+18
| |/ /
* | | Updated based on feedbacksearch-ui-updatePhil Hughes2016-04-261-2/+3
* | | Fixed issue with dropdown option not stickingPhil Hughes2016-04-261-4/+3
|/ /
* | Fixed issue with assignee object not being returnedPhil Hughes2016-04-222-2/+2
* | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-221-0/+2
|\ \
| * \ Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2110-49/+59
| |\ \
| * | | Use compact syntaxAlfredo Sumaran2016-04-211-4/+1
| * | | Allow filtering by Owned projectsAlfredo Sumaran2016-04-181-0/+5
* | | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-222-2/+11
|\ \ \ \
| * | | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-2/+11
* | | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-2/+1
* | | | | Merge branch 'label-text-color-sidebar' into 'master' Robert Speicher2016-04-212-2/+2
|\ \ \ \ \
| * | | | | Fixes text color on labels in sidebarPhil Hughes2016-04-212-2/+2
* | | | | | Merge branch 'remove-update-files' into 'master' Yorick Peterse2016-04-212-2/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Removed JS update templatesremove-update-filesPhil Hughes2016-04-192-2/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-211-1/+1
|\ \ \ \ \
| * | | | | Remove unused authorization from controllerFelipe Artur2016-04-201-5/+0
| * | | | | Show project members only for membersFelipe Artur2016-04-181-1/+6
| |/ / / /
* | | | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-212-5/+11
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-195-14/+23
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-168-36/+80
| |\ \ \ \ \ \
| * | | | | | | Optimise Merge Request builds renderingKamil Trzcinski2016-04-131-2/+0
| * | | | | | | Cleanup changesKamil Trzcinski2016-04-131-0/+0
| * | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-138-46/+67
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-111-3/+3
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix specsKamil Trzcinski2016-04-111-2/+6
| * | | | | | | | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-113-3/+7
* | | | | | | | | | Add due_date:time field to Issue modelMehmet Beydogan2016-04-201-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'multi-filter-labels' into 'master' Jacob Schatz2016-04-202-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Label text color comes from JSONPhil Hughes2016-04-202-2/+2
| * | | | | | | | | get the multi filter labels feature to work on merge request, also escape cha...Arinde Eniola2016-04-201-2/+3