cleanups

rilian · Oct 11, 2015 · 1920cbd · 1920cbd
1 parent 83efead
commit 1920cbd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
@@ -43,8 +43,6 @@ def destroy
 private
 
   def album_params
-    params.require(:album).permit(
-      :title, :title_ua, :is_published, :weight, :description, :description_ua
-    )
+    params.require(:album).permit(:title, :title_ua, :is_published, :weight, :description, :description_ua)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
   # disable registrations on PROD
-  devise :database_authenticatable, :recoverable, :rememberable#, :registerable
+  devise :database_authenticatable, :recoverable, :rememberable, :registerable
 
   validates_presence_of :password, :password_confirmation
   validates_length_of :password, minimum: 6

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -12,14 +12,14 @@
     </title>
     <meta name="description" content="<%= get_setting('description') %>">
     <meta name="author" content="<%= get_setting('copyright_holder') %>">
-    <%= stylesheet_link_tag    'application', media: 'all' %>
+    <%= stylesheet_link_tag 'application', media: 'all' %>
     <%= csrf_meta_tags %>
     <%= yield(:head) %>
     <%= auto_discovery_link_tag(:rss, rss_feed_url) %>
     <meta name="google-site-verification" content="2p1oQQtDfNHzwqUHXfb6kESw_Tcvn8YFL7Rg-cvF6a8" />
   </head>
   <body>
-    <% if get_setting('google_analytics_account').present? && Rails.env.production? && !user_signed_in? %>
+    <% if get_setting('google_analytics_account').present? && Rails.env.production? && !current_user %>
       <script>
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
           (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),