This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb | |
index 51509ec..e4a472e 100644 | |
--- a/app/controllers/projects/merge_requests_controller.rb | |
+++ b/app/controllers/projects/merge_requests_controller.rb | |
@@ -166,7 +166,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController | |
end | |
def ci_status | |
- status = @merge_request.source_project.gitlab_ci_service.commit_status(merge_request.last_commit.sha) | |
+ if @merge_request.source_project.gitlab_ci? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -NurP Topshelf/src/Topshelf/Configuration/Builders/ControlServiceBuilder.cs Topshelf/Configuration/Builders/ControlServiceBuilder.cs | |
--- Topshelf/src/Topshelf/Configuration/Builders/ControlServiceBuilder.cs Wed Nov 28 13:21:02 2012 | |
+++ Topshelf/Configuration/Builders/ControlServiceBuilder.cs Thu Nov 29 08:32:37 2012 | |
@@ -14,6 +14,7 @@ | |
{ | |
using System; | |
using Runtime; | |
+ using System.ServiceProcess; | |
public class ControlServiceBuilder<T> : |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
using System; | |
using System.Collections.Generic; | |
using System.Globalization; | |
using System.IO; | |
using System.Linq; | |
using System.Security.Cryptography; | |
using System.Text; | |
using System.Text.RegularExpressions; | |
using System.Threading; | |
using System.Threading.Tasks; |
NewerOlder