Merge branch 'configure-home-page' into 'master'

Allow to specify home page for non logged-in users

See merge request !1404

10 files changed, 39 insertions, 12 deletions

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 5116f1f177a..a937f484877 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -26,6 +26,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :signin_enabled,
       :gravatar_enabled,
       :sign_in_text,
+      :home_page_url
     )
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b83de68c5d2..6da4f91c3f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -48,6 +48,17 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authenticate_user!(*args)
+    # If user is not signe-in and tries to access root_path - redirect him to landing page
+    if current_application_settings.home_page_url.present?
+      if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
+        redirect_to current_application_settings.home_page_url and return
+      end
+    end
+
+    super(*args)
+  end
+
   def log_exception(exception)
     application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace
     application_trace.map!{ |t| "  #{t}\n" }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 67c02f5dfa4..f65e04af205 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -292,9 +292,4 @@ module ApplicationHelper
       profile_key_path(key)
     end
   end
-
-  def redirect_from_root?
-    request.env['rack.session']['user_return_to'] ==
-      '/'
-  end
 end
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 47fa6f1071c..aed4068f309 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -1,4 +1,8 @@
 class ApplicationSetting < ActiveRecord::Base
+  validates :home_page_url, allow_blank: true,
+    format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
+    if: :home_page_url_column_exist
+
   def self.current
     ApplicationSetting.last
   end
@@ -12,4 +16,8 @@ class ApplicationSetting < ActiveRecord::Base
       sign_in_text: Settings.extra['sign_in_text'],
     )
   end
+
+  def home_page_url_column_exist
+    ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url)
+  end
 end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 5ca9585e9a9..9423a207068 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -26,6 +26,11 @@
       .col-sm-10
         = f.number_field :default_projects_limit, class: 'form-control'
     .form-group
+      = f.label :home_page_url, class: 'control-label'
+      .col-sm-10
+        = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com'
+        %span.help-block We will redirect non-logged in users to this page
+    .form-group
       = f.label :sign_in_text, class: 'control-label'
       .col-sm-10
         = f.text_area :sign_in_text, class: 'form-control'
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 857ebd9b8d9..6f805f1c9d1 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -6,8 +6,7 @@
     = render "layouts/public_head_panel", title: ''
     .container.navless-container
       .content
-        - unless redirect_from_root?
-          = render "layouts/flash"
+        = render "layouts/flash"
         .row.prepend-top-20
           .col-sm-5.pull-right
             = yield
diff --git a/db/migrate/20150116234544_add_home_page_url_for_application_settings.rb b/db/migrate/20150116234544_add_home_page_url_for_application_settings.rb
new file mode 100644
index 00000000000..aa179ce3a4d
--- /dev/null
+++ b/db/migrate/20150116234544_add_home_page_url_for_application_settings.rb
@@ -0,0 +1,5 @@
+class AddHomePageUrlForApplicationSettings < ActiveRecord::Migration
+  def change
+    add_column :application_settings, :home_page_url, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index dedfce4797b..b453164d712 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150108073740) do
+ActiveRecord::Schema.define(version: 20150116234544) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -24,6 +24,7 @@ ActiveRecord::Schema.define(version: 20150108073740) do
     t.text     "sign_in_text"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "home_page_url"
   end
 
   create_table "broadcast_messages", force: true do |t|
diff --git a/features/admin/settings.feature b/features/admin/settings.feature
index 8799c053ea2..8fdf0575c2c 100644
--- a/features/admin/settings.feature
+++ b/features/admin/settings.feature
@@ -5,5 +5,5 @@ Feature: Admin Settings
     And I visit admin settings page
 
   Scenario: Change application settings
-    When I disable gravatars and save form
-    Then I should be see gravatar disabled
+    When I modify settings and save form
+    Then I should see application settings saved
diff --git a/features/steps/admin/settings.rb b/features/steps/admin/settings.rb
index e8168e85def..c2d0d2a3fa3 100644
--- a/features/steps/admin/settings.rb
+++ b/features/steps/admin/settings.rb
@@ -4,13 +4,15 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
   include SharedAdmin
   include Gitlab::CurrentSettings
 
-  step 'I disable gravatars and save form' do
+  step 'I modify settings and save form' do
     uncheck 'Gravatar enabled'
+    fill_in 'Home page url', with: 'https://about.gitlab.com/'
     click_button 'Save'
   end
 
-  step 'I should be see gravatar disabled' do
+  step 'I should see application settings saved' do
     current_application_settings.gravatar_enabled.should be_false
+    current_application_settings.home_page_url.should == 'https://about.gitlab.com/'
     page.should have_content 'Application settings saved successfully'
   end
 end