Commit Graph
31 Commits
Author SHA1 Message Date
Phil Hughes 6a13b37222 Fixed missed conflict 2016-04-11 17:20:47 +01:00
Phil Hughes 843bc44aa9 Preparing build text 2016-04-11 17:20:47 +01:00
Phil Hughes 99fe9c7b77 Corrects the button color on build status change 2016-04-11 17:20:47 +01:00
Phil Hughes 60fd4188a5 Build notification null check
Cancels build notification interval on page change
2016-04-11 17:20:47 +01:00
Jacob Schatz b471c76bcb Reset MR opts 2016-04-06 21:46:12 -04:00
Phil Hughes c613b8c6dc Put back hiding of modal 2016-03-21 09:54:13 +00:00
Phil Hughes c767f35c7f Updated based on feedback 2016-03-21 09:52:38 +00:00
Phil Hughes 3b6e2a68f3 Removed modal hide 2016-03-18 11:16:34 +00:00
Phil Hughes 3d6573fd71 Updated to fix issues risen during feedback
Correctly updates the on-screen CI text feedback
2016-03-18 11:08:03 +00:00
Phil Hughes 33aeaf6a9c Merge request title is in the notification
Short commit instead of long commit sha
2016-03-18 10:26:48 +00:00
Phil Hughes fcba255153 Commit SHA comes from JSON
Removed page refresh - instead clicking takes to the builds tab
2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes c1c786fe65 Using status from ajax call.
Removing icon changes because refresh.
2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes 00deaaafb1 removing ci_enable 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes fcc0f7c68e Remove repeated build listing 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes b2f2df3b38 Add page reload as a temporary boring solution 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes f7e2109905 Adds notifications API to MR page.
When a build status changes a notification will popup.
Fixes #10851
2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes 51ceb3802f Adds JSON callback, which is currently not working. 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes 91880e13df initial ajax build 2016-03-18 10:26:48 +00:00
Rubén Dávila 42da7cd375 Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189 2015-12-21 22:59:15 -05:00
Rubén Dávila aa1ba00936 Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 2015-12-04 10:43:33 -05:00
Valery Sizov 05fdd12fd9 Improve error message when merging fails 2015-10-01 09:45:47 +03:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' "
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
2015-08-11 10:26:19 +02:00
Dmitriy Zaporozhets 3cf4a981d6 Refactor merge request widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 15:17:10 +02:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Kamil Trzcinski 427b5df260 Added support for CI skipped status 2015-08-04 16:47:19 +02:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:03:07 +02:00
Valery Sizov af93d447b6 Explicit error when commit not found in the GitLab CI 2015-06-23 14:50:06 +03:00
Dmitriy Zaporozhets 15cfa5ca20 Fix automerge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:49:34 +02:00
Dmitriy Zaporozhets 00600a592b Extract merge request widget JS to separate class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:27:03 +02:00