summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Allow set labels from Issue/MR formsDmitriy Zaporozhets2014-07-291-1/+1
* Improve MR buildingDmitriy Zaporozhets2014-07-281-1/+1
* Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-151-13/+5
* Refactor MR build processDmitriy Zaporozhets2014-07-151-47/+21
* Error message needs to be correct.Marin Jankovski2014-07-141-1/+1
* Branches without parent commit cannot be merged.Marin Jankovski2014-07-141-8/+12
* Fix dev env. Fix MR creationDmitriy Zaporozhets2014-06-261-0/+4
* Remove protected_atrributes gem and start moving to strong paramsDmitriy Zaporozhets2014-06-261-3/+11
* Merge pull request #6992 from skv-headless/project_commits_sql_optimizationDmitriy Zaporozhets2014-06-241-0/+5
|\
| * notes count in 1 query for mr and commitsskv2014-06-101-0/+5
* | Improve MR message for huge diffsDmitriy Zaporozhets2014-06-141-0/+1
* | Apply soft diff limits to MergeRequest#new pageDmitriy Zaporozhets2014-06-131-0/+3
* | Show proper message for new MR when satellite failsDmitriy Zaporozhets2014-06-121-2/+10
|/
* Backport CI service refactoring from EEDmitriy Zaporozhets2014-05-281-1/+1
* Dont show remove source branch ckecbox/button if you dont have suchDmitriy Zaporozhets2014-05-271-6/+0
* Compare branches in MergeRequestsController#new actionDmitriy Zaporozhets2014-05-081-4/+20
* Satellite will exist when doing automerge_check.Marin Jankovski2014-04-111-2/+0
* Allow people to remove source branch of fork project in MRDmitriy Zaporozhets2014-04-071-5/+5
* Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlbo...Dmitriy Zaporozhets2014-04-061-5/+16
|\
| * Add button for removing source branch for merged MR's.Jacob Carlborg2013-12-191-5/+15
* | Use MergeRequest services in API and controllersDmitriy Zaporozhets2014-04-021-25/+5
* | Remove author_id_of_changes from appDmitriy Zaporozhets2014-03-251-1/+1
* | Feature: reopen closed merge requestDmitriy Zaporozhets2014-02-281-2/+2
* | Fix gitlab ci widget for forksDmitriy Zaporozhets2014-02-261-1/+1
* | Merge pull request #5719 from jacob-carlborg/mr_targetDmitriy Zaporozhets2014-02-261-1/+5
|\ \
| * | By default, target original repository if fork when creating new MR.Jacob Carlborg2014-02-241-1/+5
* | | Move services for collecting items to FindersDmitriy Zaporozhets2014-02-251-1/+1
|/ /
* | Refactor MR code reloadDmitriy Zaporozhets2014-02-181-3/+0
* | Allow change assignee/milestone from MergeRequest show pageDmitriy Zaporozhets2014-02-181-1/+8
* | Show only people who have assigned merge requests in assignee dropdownDmitriy Zaporozhets2014-02-131-0/+1
* | Fix bug with merge request branch selectDmitriy Zaporozhets2014-01-311-2/+5
* | Merge branch 'improve/mr_diff'Dmitriy Zaporozhets2014-01-231-1/+1
|\ \
| * | Always create merge_request_diff if MR createdDmitriy Zaporozhets2014-01-221-1/+0
| * | Render MR diff correctlyDmitriy Zaporozhets2014-01-221-0/+1
* | | Fix selectbox when submit MR from fork to originDmitriy Zaporozhets2014-01-231-0/+4
* | | Merge pull request #6075 from skv-headless/remove_deprecated_findersDmitriy Zaporozhets2014-01-221-1/+1
|\ \ \ | |/ / |/| |
| * | Remove deprecated findersskv2014-01-191-1/+1
* | | Dont override project_id params when use issues/mr filteringDmitriy Zaporozhets2014-01-201-2/+1
|/ /
* | Use FilteringService for project issuus, mrsDmitriy Zaporozhets2014-01-151-3/+9
* | Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/...Dmitriy Zaporozhets2014-01-151-1/+1
|\ \
| * | Use params[:merge_commit_message] in MergeRequestController for automergeDmitriy Zaporozhets2014-01-131-1/+1
* | | Add sort dropdown to merge requests listDmitriy Zaporozhets2014-01-141-0/+2
|/ /
* | Update commentable controllers with new note varsDmitriy Zaporozhets2013-12-251-2/+1
* | Make note anchors actually workDmitriy Zaporozhets2013-12-251-3/+4
* | Dont allow change of MR target or source projects after it was createdDmitriy Zaporozhets2013-12-201-0/+5
|/
* Fix dashboard event cachingDrew Blessing2013-12-131-0/+1
* Allow close of broken MRDmitriy Zaporozhets2013-12-121-0/+15
* Add new methods to MR to check if source or target branch existsDmitriy Zaporozhets2013-12-121-4/+7
* Remove .js format for MergeRequest controllerDmitriy Zaporozhets2013-12-021-4/+7
* Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2Dmitriy Zaporozhets2013-09-261-6/+9
|\
View Lorry Controller Status