Partly integrate commits

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb
index 0c1e264..4182675 100644
--- a/app/helpers/builds_helper.rb
+++ b/app/helpers/builds_helper.rb
@@ -28,4 +28,14 @@ module BuildsHelper
   def build_url(build)
     project_build_url(build.project, build)
   end
+
+  def build_status_alert_class(build)
+    if build.success?
+      'alert-success'
+    elsif build.failed? || build.canceled?
+      'alert-danger'
+    else
+      'alert-warning'
+    end
+  end
 end
diff --git a/app/helpers/gitlab_helper.rb b/app/helpers/gitlab_helper.rb
index a8cac14..a5d3192 100644
--- a/app/helpers/gitlab_helper.rb
+++ b/app/helpers/gitlab_helper.rb
@@ -15,6 +15,6 @@ module GitlabHelper
   def gitlab_commit_link project, sha
     gitlab_url = project.gitlab_url.dup
     gitlab_url << "/commit/#{sha}"
-    link_to sha, gitlab_url
+    link_to sha[0...10], gitlab_url
   end
 end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index d8d9e39..ebc06c3 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -9,16 +9,6 @@ module ProjectsHelper
     end
   end
 
-  def build_status_alert_class build
-    if build.success?
-      'alert-success'
-    elsif build.failed? || build.canceled?
-      'alert-danger'
-    else
-      'alert-warning'
-    end
-  end
-
   def ref_tab_class ref = nil
     'active' if ref == @ref
   end