Merge branch 'feature/bootstrap' of github.com:Retrospring/retrospring into feature/bootstrap

app/helpers/theme_helper.rb

@@ -43,7 +43,7 @@ module ThemeHelper
 
     body += "}"
 
-    content_tag(:style, body, data: { "turbolinks-track": false })
+    content_tag(:style, body)
   end
 
   def get_active_theme

app/views/layouts/base.haml

@@ -12,13 +12,12 @@
     %title= yield(:title)
     = javascript_include_tag 'i18n', 'data-turbolinks-track' => true
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
-    = render_theme
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     - if user_signed_in?
       - if current_user.mod?
         = javascript_include_tag 'moderation', 'data-turbolinks-track' => true
     = csrf_meta_tags
-  %body#version1
+  %body
     - if user_signed_in?
       = render 'navigation/main'
     - else
@@ -37,4 +36,5 @@
             = succeed ')' do
               = `git rev-parse --short HEAD`.strip
           %p.text-danger Debug params:
-          = debug params
+          = debug params
+    = render_theme

app/views/question/show.haml

@@ -12,7 +12,7 @@
     %button#load-more-btn.btn.btn-default{type: :button, data: { last_id: @answers_last_id }}
       Load more
 
-  - if user_signed_in? and !current_user.answered? @question and current_user != @question.user and @question.user.privacy_allow_stranger_answers
+  - if user_signed_in? && !current_user.answered?(@question) && current_user != @question.user && @question.user&.privacy_allow_stranger_answers
     .card#q-answer-box
       .card-header
         %h3.card-title= t('views.question.title')

app/views/settings/_data.haml

@@ -132,22 +132,28 @@
         %h4 Sign In
 
         %p.font-weight-bold.mb-0 Current Sign In
-        %p.text-muted= localize(current_user.current_sign_in_at)
+        %p.text-muted= current_user.current_sign_in_at ? localize(current_user.current_sign_in_at) : "Not set"
 
         %p.font-weight-bold.mb-0 Last Sign In
-        %p.text-muted= localize(current_user.last_sign_in_at)
+        %p.text-muted= current_user.last_sign_in_at ? localize(current_user.last_sign_in_at) : "Not set"
 
         %p.font-weight-bold.mb-0 Remember me set at
-        %p.text-muted= localize(current_user.remember_created_at)
+        %p.text-muted= current_user.remember_created_at ? localize(current_user.remember_created_at) : "Not set"
       .col-md-6.col-sm-6.col-xs-12
         %h4 Create/Update
 
         %p.font-weight-bold.mb-0 Account created
         %p.text-muted
-          = localize(current_user.created_at)
+          - if current_user.created_at
-          = " (#{time_ago_in_words(current_user.created_at)} ago)"
+            = localize(current_user.created_at)
+            = " (#{time_ago_in_words(current_user.created_at)} ago)"
+          - else
+            Not set
 
         %p.font-weight-bold.mb-0 Account last updated
         %p.text-muted
-          = localize(current_user.updated_at)
+          - if current_user.created_at
-          = " (#{time_ago_in_words(current_user.updated_at)} ago)"
+            = localize(current_user.updated_at)
+            = " (#{time_ago_in_words(current_user.updated_at)} ago)"
+          - else
+            Not set

spec/helpers/theme_helper_spec.rb

@@ -18,7 +18,7 @@ describe ThemeHelper, :type => :helper do
       end
 
       it "returns a theme" do
-        expect(helper.render_theme).to include('<style data-turbolinks-track="false">:root {')
+        expect(helper.render_theme).to include('<style>:root {')
       end
 
       it "contains correct theme background colors" do
@@ -141,4 +141,4 @@ describe ThemeHelper, :type => :helper do
       end
     end
   end
-end
+end