summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+8
|\
| * Encode state as base64 stringKamil Trzcinski2016-05-091-8/+1
| * Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-0/+15
* | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' Rémy Coutable2016-05-121-1/+1
|\ \
| * | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-101-1/+1
| |/
* | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-2/+4
|\ \ | |/ |/|
| * Always mention HTTP statusJacob Vosmaer2016-05-031-1/+1
| * Inform user about questionable hook successJacob Vosmaer2016-05-031-2/+4
| * Improve documentation and web test for web hooksJacob Vosmaer2016-05-031-1/+1
* | 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 '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-021-3/+11
|\ \ \
| * | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-021-3/+11
| |/ /
* | | 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
| |/
* | Project deploy keys updated UIPhil Hughes2016-04-251-13/+18
|/
* Fixed issue with assignee object not being returnedPhil Hughes2016-04-222-2/+2
* 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-191-4/+6
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-161-12/+32
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | 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-134-3/+19
| |\ \ \ \ \
| * \ \ \ \ \ 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
| * | | | | | | Filter by multiple labels with little animation.Jacob Schatz2016-04-131-2/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable2016-04-202-15/+4
|\ \ \ \ \ \ \
| * | | | | | | improve check if wiki page is persistedSebastian Klier2016-04-201-1/+1
| * | | | | | | remove unnecessary methodsSebastian Klier2016-04-201-11/+0
| * | | | | | | add slack notifications for wiki pagesSebastian Klier2016-04-202-4/+4
* | | | | | | | Use Rails-way to send file by X-SendfileTomasz Maczukin2016-04-191-5/+2
* | | | | | | | Add feature specs for raw traceTomasz Maczukin2016-04-191-1/+1
* | | | | | | | Switch raw trace to use X-Sendfile headerTomasz Maczukin2016-04-191-3/+6