summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-274-5/+13
|\
| * Merge branch 'ci-status-mr-index' into 'master' Dmitriy Zaporozhets2015-10-252-1/+4
| |\
| | * Move rendering CI status to helperDmitriy Zaporozhets2015-10-231-3/+1
| | * Add tests for MR index pageDmitriy Zaporozhets2015-10-231-1/+2
| | * Render CI status on merge requests index pageDmitriy Zaporozhets2015-10-232-1/+5
| * | Add clipboard buttons to each step of "How to merge"Robert Speicher2015-10-231-2/+5
| |/
| * Fix alignment of the filter counter for Issuablesrs-issuable-filter-count-styleRobert Speicher2015-10-221-2/+4
* | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-212-38/+38
|\ \ | |/
| * Fix missing commit status for widget when no CI service is enabledmerge-request-widgetKamil Trzcinski2015-10-161-37/+36
| * Sentences end in periods.sentences-end-in-periodsDouwe Maan2015-10-151-1/+2
* | Cache rendered contents of issues, MRs and notesDouwe Maan2015-10-141-1/+1
* | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-141-2/+2
|\ \ | |/
| * Add new GitLab colorsDmitriy Zaporozhets2015-10-081-1/+1
| * Fixes to dropdown, font colors for new project and merge requestAndrey2015-10-071-1/+1
* | Use Gitlab::Markdown.render with :pipeline option rather than different methodsDouwe Maan2015-10-142-2/+2
|/
* Use CI commit status for merge request widgetcloser-ci-integrationDmitriy Zaporozhets2015-10-061-22/+36
* Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-301-2/+3
* Fix error when MR source branch no longer exists.fix-mr-missing-source-branch-errorDouwe Maan2015-09-221-1/+1
* Fixed MR handling when GitLab CI project is not presentfix-ci-handlingKamil Trzcinski2015-09-211-1/+2
* Move project header title definition to view in question.Douwe Maan2015-09-176-0/+11
* Merge branch 'mr-xss' into 'master' Robert Speicher2015-09-081-8/+8
|\
| * Escape user-provided content in preserved HAML sectionsDouwe Maan2015-09-081-8/+8
* | Improve diff UI and mr compare pageDmitriy Zaporozhets2015-09-082-4/+2
* | Style merge request pageDmitriy Zaporozhets2015-09-082-4/+1
* | Improve font size on issues/mr listissue-redesignDmitriy Zaporozhets2015-09-081-1/+1
* | Style issue page, comments and part of merge request pageDmitriy Zaporozhets2015-09-082-8/+11
* | Small restyle of issue and merge request pagesDmitriy Zaporozhets2015-09-073-17/+17
|/
* Dont render merge request target branch in listDmitriy Zaporozhets2015-09-041-5/+0
* Apply new style for issues, merge requests and milestone pagesDmitriy Zaporozhets2015-09-042-8/+7
* Limit content width for big screens except certain pagesDmitriy Zaporozhets2015-08-261-0/+3
* Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-172-10/+9
|\
| * Move merge manually text below merge widgetDmitriy Zaporozhets2015-08-112-10/+9
* | Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-111-10/+16
|\ \ | |/
| * Merge branch 'check-out-branch-button' into 'master' Dmitriy Zaporozhets2015-08-111-10/+16
| |\
| | * Merge branch 'master' into check-out-branch-buttoncheck-out-branch-buttonDouwe Maan2015-08-1015-96/+111
| | |\
| | * | Add "Check out branch" button to the MR page.Douwe Maan2015-08-081-10/+16
| * | | Merge branch 'mr-widget-text' into 'master' Dmitriy Zaporozhets2015-08-1115-96/+111
| * | | Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-111-8/+0
| * | | Refactor merge request widgetDmitriy Zaporozhets2015-08-115-49/+21
| * | | Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-111-23/+18
* | | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-1123-178/+147
|/ / /
* | | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-117-6/+11
* | | Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-116-33/+74
* | | Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets2015-08-1115-111/+96
| |/ |/|
* | More textual tweaksmr-widget-textDouwe Maan2015-08-093-5/+6
* | Tweak MR widget text some more.Douwe Maan2015-08-083-3/+5
* | Improve text in MR "How To Merge" modal.Douwe Maan2015-08-081-26/+29
* | Improve MR merge widget text and UI consistency.Douwe Maan2015-08-0814-67/+76
|/
* Merge branch 'improve-merge-requests' into 'master' Dmitriy Zaporozhets2015-08-076-74/+33
|\
| * Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-072-31/+18
View Lorry Controller Status