summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-16 17:22:17 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-16 17:22:17 -0800
commit38600e328bf4bacf2d3e4288943fb7652ee6c674 (patch)
tree5d66baf076315ee94ddf6542c988f3f4a1bca16d /app/models/application_setting.rb
parente7f772550c5fad5761777b76f97726be84693746 (diff)
downloadgitlab-ce-38600e328bf4bacf2d3e4288943fb7652ee6c674.tar.gz
Validate application settings only if column exists
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index d9c73559098..aed4068f309 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -1,6 +1,7 @@
class ApplicationSetting < ActiveRecord::Base
validates :home_page_url, allow_blank: true,
- format: { with: URI::regexp(%w(http https)), message: "should be a valid url" }
+ format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
+ if: :home_page_url_column_exist
def self.current
ApplicationSetting.last
@@ -15,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