summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-083-1/+7
|\
| * Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-083-1/+7
* | Merge branch 'awards-control-margin' into 'master' Annabel Dunstone Gray2016-09-081-1/+1
|\ \
| * | fix margin for awards-control buttonstauriedavis2016-09-061-1/+1
| |/
* | Refactor merge request version compare featureDmitriy Zaporozhets2016-09-071-3/+5
* | Improve merge request version featureDmitriy Zaporozhets2016-09-071-24/+27
* | Expand abbreviations in merge request version path helperDmitriy Zaporozhets2016-09-071-3/+3
* | Refactor code for merge request version compare featureDmitriy Zaporozhets2016-09-071-33/+30
* | Improve merge request version switch/compare dropdownDmitriy Zaporozhets2016-09-071-34/+35
* | Compare merge request version against other version on changes pageDmitriy Zaporozhets2016-09-071-10/+14
* | Add link to compare merge request versionsDmitriy Zaporozhets2016-09-071-0/+22
|/
* Change "check out, review, and merge locally" URL to use default clone protocol.Judson Neer2016-09-061-1/+1
* Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-051-2/+3
* Improve grammarKatarzyna Kobierska2016-08-301-1/+1
* User can edit closed MR with deleted forkKatarzyna Kobierska2016-08-301-0/+4
* Make it more obvious when the user isn't currently viewing the latest mr versionDmitriy Zaporozhets2016-08-251-0/+4
* Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-251-2/+1
* Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-222-1/+4
|\
| * Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+3
| * Merge branch 'fix-button-missing-type' into 'master' Jacob Schatz2016-08-191-1/+1
| |\
| | * Fix button missing typeClement Ho2016-08-081-1/+1
* | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1915-18/+186
|\ \ \ | |/ /
| * | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-181-7/+4
| |\ \
| | * | Refactor to mark Changes tab as active on new MR page.Ruben Davila2016-08-181-2/+2
| | * | Fix tabs navigation and do not update URL via pushstateAlfredo Sumaran2016-08-171-7/+4
| * | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1712-10/+153
| |\ \ \ | | |/ /
| | * | Merge branch 'mc-ui'Douwe Maan2016-08-178-4/+140
| | |\ \
| | | * \ Merge branch 'master' into mc-uiDouwe Maan2016-08-151-0/+13
| | | |\ \
| | | * | | Fix hard coded plural text.Fatih Acet2016-08-131-1/+1
| | | * | | Disable commit button if commit message textarea empty.Fatih Acet2016-08-121-3/+2
| | | * | | Remove commit button loader and update title while committing.Fatih Acet2016-08-121-1/+1
| | | * | | Fix bug where merge widget wouldn't show up after resolving conflictsDouwe Maan2016-08-121-2/+8
| | | * | | Minor code style tweaks in viewsDouwe Maan2016-08-122-12/+12
| | | * | | “Showing N conflicts for A into B” -> “Showing N conflicts between A an...Douwe Maan2016-08-121-2/+2
| | | * | | Use a regular flash message after resolution is completeDouwe Maan2016-08-121-6/+0
| | | * | | Prevent “This merge request contains merge conflicts” from being shown af...Douwe Maan2016-08-122-2/+2
| | | * | | Don’t hardcode pathsDouwe Maan2016-08-122-4/+3
| | | * | | Show tooltip when conflicts cannot be resolved through GitLabDouwe Maan2016-08-121-1/+7
| | | * | | Show appropriate message when conflicts have already been resolvedDouwe Maan2016-08-121-6/+6
| | | * | | Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-121-3/+5
| | | * | | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-1/+1
| | | * | | Separate inline haml vue templates into new files.Fatih Acet2016-08-125-107/+104
| | | * | | Simplify Haml template and Scss files for MC UI.Fatih Acet2016-08-121-36/+23
| | | * | | Dynamically highlight code blocks in merge conflicts widgets.Fatih Acet2016-08-121-1/+1
| | | * | | Update button titles in merge conflicts widget header.Fatih Acet2016-08-121-2/+4
| | | * | | Show loading button while Ajax request is in progress.Fatih Acet2016-08-121-4/+6
| | | * | | Set flash message after conflict is resolvedSean McGivern2016-08-121-0/+6
| | | * | | Don't allow resolving invalid conflictsSean McGivern2016-08-121-3/+3
| | | * | | Prefer v-show instead of v-if.Fatih Acet2016-08-121-2/+2
| | | * | | Add file icon and blob link.Fatih Acet2016-08-121-4/+6
View Lorry Controller Status