Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 2 deletions

diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 68d78959407..fcf99644e66 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -38,7 +38,8 @@ module EnvironmentsHelper
       "tags-path" => project_tags_path(project),
       "has-metrics" => "#{environment.has_metrics?}",
       "prometheus-status" => "#{environment.prometheus_status}",
-      "external-dashboard-url" => project.metrics_setting_external_dashboard_url
+      "external-dashboard-url" => project.metrics_setting_external_dashboard_url,
+      "environment-state" => "#{environment.state}"
     }
   end
 
diff --git a/app/models/member.rb b/app/models/member.rb
index 5aa5655fc4a..dc2c8a37c0e 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -257,7 +257,9 @@ class Member < ApplicationRecord
     def retrieve_user(user)
       return user if user.is_a?(User)
 
-      User.find_by(id: user) || User.find_by(email: user) || user
+      return User.find_by(id: user) if user.is_a?(Integer)
+
+      User.find_by(email: user) || user
     end
 
     def retrieve_member(source, user, existing_members)