summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Add raw trace output for GitLab WorkhorseTomasz Maczukin2016-04-191-1/+9
|/ / / / / / /
* | | | | | | Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-191-13/+17
|\ \ \ \ \ \ \
| * | | | | | | Add support to cherry-pick any commitP.S.V.R2016-04-181-13/+17
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '14566-confidential-issue-branches' into 'master' Robert Speicher2016-04-191-4/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove unused variable in `IssuesController`.Timothy Andrew2016-04-181-2/+0
| * | | | | | Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-152-11/+29
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-133-2/+19
| |\ \ \ \ \ \
| * | | | | | | Refactor `Issue#related_branches`Timothy Andrew2016-04-121-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Use guard clause to check ability to share projectGrzegorz Bizon2016-04-191-7/+4
* | | | | | | Refactor method that shares project with a groupGrzegorz Bizon2016-04-191-4/+3
* | | | | | | Check permissions when sharing project with groupGrzegorz Bizon2016-04-191-4/+10
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'assign-to-issuable-opener' into 'master' Jacob Schatz2016-04-151-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-151-3/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-053-10/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-03-2920-109/+241
| |\ \ \ \ \ \ \
| * | | | | | | | Issuable can be assigned to authorZeger-Jan van de Weg2016-02-221-2/+2
* | | | | | | | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-10/+30
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-1/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-0/+16
|\ \ \ \ \ \ \