Adds empty environments page

2 files changed, 7 insertions, 3 deletions

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 719a3c37f45..5475e333db9 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -5,7 +5,7 @@ class Projects::ApplicationController < ApplicationController
   skip_before_action :authenticate_user!
   before_action :project
   before_action :repository
-  before_action :environment
+  before_action :available_environment
   layout 'project'
 
   helper_method :repository, :can_collaborate_with_project?, :user_access
@@ -33,8 +33,8 @@ class Projects::ApplicationController < ApplicationController
     @repository ||= project.repository
   end
 
-  def environment
-    @environment ||= project.environments.first
+  def available_environment
+    @available_environment ||= project.environments.with_state(:available).first
   end
 
   def authorize_action!(action)
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 0821362f5df..47b2028860d 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -31,6 +31,10 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     end
   end
 
+  def empty
+    render :empty
+  end
+
   def folder
     folder_environments = project.environments.where(environment_type: params[:id])
     @environments = folder_environments.with_state(params[:scope] || :available)