summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Inline the new checks into normal update error handlingNick Thomas2018-12-071-13/+8
* Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-061-3/+8
* Improve error message when attempting to reopen MR and there's a new open MR ...Akos Gyimesi2018-12-061-0/+4
* render :nothing option is deprecated, Use head method to respond with empty r...Jasper Maes2018-11-231-1/+1
* Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-121-3/+0
* Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-311-1/+2
* Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into '...Nick Thomas2018-10-291-1/+13
|\
| * Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-261-1/+13
* | post merge pipeline and environments statusAlessio Caiazza2018-10-291-3/+9
|/
* Frontend: Review app changesFilipa Lacerda2018-10-221-0/+3
* Move ci_environments_status to a modelAlessio Caiazza2018-10-181-36/+4
* Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-081-6/+0
|\
| * Remove dead code on main MR pageOswaldo Ferreira2018-10-051-6/+0
* | Don't build project services unneccesarilyBrett Walker2018-10-041-2/+2
* | Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-...Bob Van Landuyt2018-10-011-0/+4
|\ \ | |/ |/|
| * Ports new refactor from EE to CETiago Botelho2018-09-241-0/+3
| * Applies the CE backport of EE#657Tiago Botelho2018-09-241-0/+1
* | Enable even more frozen string in app/controllersgfyoung2018-09-251-0/+2
|/
* Fix mention in edit mrAlin Ciciu2018-09-121-0/+1
* Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-221-1/+1
* Squashed commit of the following:Shinya Maeda2018-08-071-2/+2
* Use serializable_hash for compared resultsShinya Maeda2018-08-031-1/+1
* Set polling interval to the header in test_reports endpointShinya Maeda2018-08-021-0/+2
* Squashed commit of the following:Shinya Maeda2018-08-021-0/+15
* Support manually stopping any environment from the UIWinnie Hellmann2018-07-101-1/+1
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* Changes tab VUE refactoringFelipe Artur2018-06-211-0/+3
* Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-151-1/+1
* Render 'invalid' if #target_branch_missing?Ash McKenzie2018-06-061-18/+7
* Rename #check_if_can_be_merged -> #mark_merge_request_mergeableAsh McKenzie2018-06-061-2/+2
* Rename #close_merge_request_without_source_projectAsh McKenzie2018-06-061-2/+2
* Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-2/+2
* Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-181-2/+2
* Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-061-1/+1
* Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritanceSean McGivern2018-02-211-3/+2
* Let CI catch N + 1 callszj-n-1-merge-requests-showZeger-Jan van de Weg2018-02-071-4/+1
* Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-011-0/+6
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+17
* Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-2/+6
* tidying up the changesmicael.bergeron2017-12-071-3/+0
* Use actual head pipeline on merge request serializerFelipe Artur2017-12-051-3/+3
* Check if head_pipeline is correct before mergingFelipe Artur2017-12-051-3/+3
* Optimise getting the pipeline status of commitsci-pipeline-status-queryYorick Peterse2017-11-161-1/+2
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-081-2/+0
|\
| * Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-081-2/+0
* | Refactor issuables index actionsJarka Kadlecova2017-11-071-24/+8
|/
* removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-2/+0
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-9/+1
* Load participants asyncEric Eastwood2017-10-311-1/+1
View Lorry Controller Status