summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget
Commit message (Collapse)AuthorAgeFilesLines
* Replace CoffeeScript block into JavaScript in Views.Jason Lee2015-11-104-25/+32
| | | | | | | For example view: shared/issuable/_context CoffeeScript: 190ms JavaScript: 19.7ms
* Merge button has color from CI statusBaldinof2015-11-061-1/+3
|
* Render CI status on merge requests index pageDmitriy Zaporozhets2015-10-231-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix missing commit status for widget when no CI service is enabledmerge-request-widgetKamil Trzcinski2015-10-161-37/+36
|
* Use CI commit status for merge request widgetcloser-ci-integrationDmitriy Zaporozhets2015-10-061-22/+36
| | | | | | | | For temporary compatibility with other services like Jenkins we ask for CI status via AJAX request if there is no commit status in GitLab database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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
|
* Style merge request pageDmitriy Zaporozhets2015-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-1/+0
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move merge manually text below merge widgetDmitriy Zaporozhets2015-08-111-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'mr-widget-text' into 'master' Dmitriy Zaporozhets2015-08-1114-70/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve text of MR merge widget and manual merge modal Modal with manual merge instructions: ![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png) Archived: ![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png) WIP: ![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png) Missing target branch: ![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png) Missing source branch: ![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png) Nothing to merge: ![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png) Checking ability to merge: ![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png) Conflicts when allowed to merge: ![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png) Conflicts when not allowed to merge: ![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png) Mergeable when allowed to merge: ![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png) Mergeable when not allowed to merge: ![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png) Merge in progress: ![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png) Merge failed: ![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png) Merged: ![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png) Closed: ![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png) cc @dzaporozhets @rspeicher See merge request !1120
| * Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-111-8/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor merge request widgetDmitriy Zaporozhets2015-08-114-39/+21
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-1116-114/+95
|/ | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-114-3/+8
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-113-13/+39
| | | | | This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
* Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets2015-08-1114-82/+70
| | | | | This reverts commit 151d9fb35fd66a161cf0e1f95d7b0f0448ca8034, reversing changes made to 819d110cabfc2791e0e84bd89b9f87aef570c1db.
* More textual tweaksmr-widget-textDouwe Maan2015-08-093-5/+6
|
* Tweak MR widget text some more.Douwe Maan2015-08-083-3/+5
|
* Improve MR merge widget text and UI consistency.Douwe Maan2015-08-0814-67/+76
|
* Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-071-8/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor merge request widgetDmitriy Zaporozhets2015-08-074-39/+21
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Split merge conflict messages on 2 linesnicer-merge-conflicts-widgetDmitriy Zaporozhets2015-08-061-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-054-8/+3
|\
| * Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-041-2/+4
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-162-3/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove satellitesDmitriy Zaporozhets2015-07-152-5/+0
| | |
* | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-041-0/+6
| |/ |/|
* | Update merge request text to reflect editability of source/target branchStan Hu2015-08-031-2/+4
|/ | | | Closes #2134
* Remove disableButtonIf[Any]EmptyField calls from formsRobert Speicher2015-06-261-3/+1
| | | | These have been replaced by the "requiresInput" behavior.
* Explicit error when commit not found in the GitLab CIValery Sizov2015-06-231-0/+6
|
* Revert merge request states renamingDmitriy Zaporozhets2015-06-192-2/+2
| | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix automergeDmitriy Zaporozhets2015-06-111-4/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve variables in mr widgetDmitriy Zaporozhets2015-06-113-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-116-11/+37
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-1113-46/+42
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor accept merge request widgetDmitriy Zaporozhets2015-06-1117-0/+217
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status