summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-9/+1
* Load participants asyncEric Eastwood2017-10-311-1/+1
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-0/+8
* Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-061-1/+2
|\
| * Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-061-1/+2
* | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-061-3/+3
|/
* Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-051-3/+2
* Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-281-2/+2
* Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-2/+2
* Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-151-2/+2
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-5/+0
* Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann2017-07-261-0/+6
* Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-141-3/+8
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-6/+3
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-396/+61
* Merge branch 'backport-projects-mr-controller-changes' into 'master'Douwe Maan2017-06-221-3/+7
|\
| * Backport changes to Projects::MergeRequestsController for gitlab-org/gitlab-e...Nick Thomas2017-06-211-3/+7
* | Merge branch 'backport-check-project-feature' into 'master'Douwe Maan2017-06-211-5/+1
|\ \ | |/ |/|
| * Use the new check_project_feature_available! method in project controllersNick Thomas2017-06-211-5/+1
* | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-7/+7
|/
* Remove @commit in compare and MR controllersDouwe Maan2017-05-231-7/+0
* Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-2/+0
* Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-181-8/+10
* Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-7/+11
* Add Prometheus memory sparkline to MR widgetkushalpandya2017-05-091-4/+4
* Merge request widget redesignFatih Acet2017-05-091-93/+74
* Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-6/+9
* Use preload to avoid Rails using JOINLin Jen-Shin2017-04-131-1/+1
* Fix specsDouwe Maan2017-04-091-4/+6
* Some code tweaksDouwe Maan2017-04-081-6/+3
* Fix specs and make tweaksDouwe Maan2017-04-081-30/+35
* Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-17/+11
* Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-0/+4
|\
| * Enable polling for pipelines table other pagesToon Claes2017-04-061-0/+4
* | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-061-1/+1
|\ \ | |/
| * Show the test coverage if it is availabletc-show-pipeline-coverage-if-availToon Claes2017-04-061-1/+1
* | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-061-1/+1
|\ \ | |/
| * Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-051-1/+1
* | Address review commentsDouwe Maan2017-04-051-1/+1
* | Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-051-1/+1
* | Add option to start a new discussion on an MRDouwe Maan2017-04-051-25/+5
|/
* Fix a few N+1 queries identified by Bulletfix-nplusone-queriesStan Hu2017-04-021-0/+1
* Merge branch 'mr-diffs-speed-up' into 'master' Rémy Coutable2017-03-271-22/+22
|\
| * Only load what we need when visiting MR diffs pageSean McGivern2017-03-271-22/+22
* | Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serialize...Kamil Trzciński2017-03-271-1/+7
|\ \ | |/ |/|
| * Move conditional statement to PipelineSerializer#represent_statusShinya Maeda2017-03-231-1/+0
| * Use detailed_status effectively. Remove unnecesarry context(nest). Add new co...Shinya Maeda2017-03-231-0/+1
| * Rename endpoints 'status' to 'pipeline_status' in merge_requestsShinya Maeda2017-03-231-2/+2
| * Fix rspec failureShinya Maeda2017-03-231-2/+1
View Lorry Controller Status