Minor style improvement

3 files changed, 17 insertions, 15 deletions

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 5f7f46cf566..5c802798028 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -404,30 +404,22 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def ci_environments_status
-    environments = 
+    environments =
       begin
         @merge_request.environments.map do |environment|
           next unless can?(current_user, :read_environment, environment)
 
           deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
 
-          environment_data = {
-            name: environment.name,
+          {
             id: environment.id,
+            name: environment.name,
             url: namespace_project_environment_path(@project.namespace, @project, environment),
             external_url: environment.external_url,
-            deployed_at: deployment ? deployment.created_at : nil
+            external_url_formatted: environment.formatted_external_url,
+            deployed_at: deployment.try(:created_at),
+            deployed_at_formatted: deployment.try(:formatted_deployment_time)
           }
-
-          if environment_data[:external_url]
-            environment_data[:external_url_formatted] = environment_data[:external_url].gsub(/\A.*?:\/\//, '')
-          end
-
-          if environment_data[:deployed_at]
-            environment_data[:deployed_at_formatted] = environment_data[:deployed_at].to_time.in_time_zone.to_s(:medium)
-          end
-
-          environment_data
         end.compact
       end
 
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index f63cc179b9e..3d9902d496e 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -84,6 +84,10 @@ class Deployment < ActiveRecord::Base
       take
   end
 
+  def formatted_deployment_time
+    created_at.to_time.in_time_zone.to_s(:medium)
+  end
+
   private
 
   def ref_path
diff --git a/app/models/environment.rb b/app/models/environment.rb
index c6cae81ce6a..d970bc0a005 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -53,11 +53,17 @@ class Environment < ActiveRecord::Base
 
     return nil unless ref
 
-    deployment_id = ref.split('/').last.to_i
+    deployment_id = ref.split('/').last
     deployments.find(deployment_id)
   end
 
   def ref_path
     "refs/environments/#{Shellwords.shellescape(name)}"
   end
+
+  def formatted_external_url
+    return nil unless external_url
+
+    external_url.gsub(/\A.*?:\/\//, '')
+  end
 end