summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
| * with_status to only_statusShinya Maeda2017-03-231-1/+1
| * Expose only status. ci_cd_status to status. Support abstract class.Shinya Maeda2017-03-231-2/+3
| * Add api points for ci cd status. Add favicon.Shinya Maeda2017-03-231-1/+7
* | fix new MR form erroneously selects tag as source when branch of same name ex...Sanster2017-03-241-2/+2
|/
* Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-201-1/+1
* Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
* Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-011-12/+12
|\
| * Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-12/+12
* | Fix rubocop errorfix/gb/improve-merge-request-pipelines-apiFilipa Lacerda2017-02-281-1/+2
* | Reinstate new merge request pipelines hash in APIGrzegorz Bizon2017-02-281-2/+3
|/
* Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-271-12/+11
|\
| * Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-241-12/+11
* | Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-14/+14
* | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-18/+18
* | Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-18/+18
* | Fix code for copsDouwe Maan2017-02-231-8/+9
* | Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
* | Enable Style/DotPositionDouwe Maan2017-02-231-14/+14
|/
* Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-221-1/+1
|\
| * Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-211-0/+3
| |\
| * | Add merge request count to each issue on issues listblackst0ne2017-02-171-1/+1
* | | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-211-0/+11
| |/ |/|
* | Merge branch '27920-both-wip-messages-showing' into 'master' Fatih Acet2017-02-171-0/+3
|\ \ | |/ |/|
| * Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-141-0/+3
* | Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-161-3/+6
|/
* Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-091-2/+5
* Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-071-2/+4
|\
| * Fix rendering pipelines for a new merge requestGrzegorz Bizon2017-02-071-2/+4
* | Merge branch 'route-map' into 'master' Robert Speicher2017-02-071-4/+6
|\ \
View Lorry Controller Status