Merge branch 'release/0.17.0.16'

ulmic · Apr 3, 2017 · a3a5f03 · a3a5f03
2 parents b050a43 + bb160e4
commit a3a5f03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/views/web/activity_lines/lider/ya_liders/show.html.haml b/app/views/web/activity_lines/lider/ya_liders/show.html.haml
@@ -17,7 +17,7 @@
       %div
         - @participants.each do |participant|
           = render 'participant_cell', participant: participant
-- if signed_in?
+-# if signed_in?
   - if @contest.current_stage.participants.map(&:user_id).include?(current_user.id) && params[:token] == Token.where(record_type: 'ActivityLines::Lider::YaLider::Participant', record_id: current_user.current_ya_lider_participant.id).first&.content
     %hr
     .row
@@ -26,7 +26,7 @@
           = link_to 'Создать отчёт', new_users_activity_lines_lider_ya_lider_participant_event_path(event_id: current_user.current_ya_lider_participant.event.id, step: 3), class: 'btn btn-branded'
         - else
           = link_to t('.add_event'), new_users_activity_lines_lider_ya_lider_participant_event_path(step: 1), class: 'btn btn-branded'
-- else
+-# else
   %hr
   .row
     .auth_button_row

diff --git 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: 20170402193743) do
+ActiveRecord::Schema.define(version: 20170402205815) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"