Merge branch 'master' into add-admin-instructions

matyikriszta · web-flow · commit 30241550ad05 · 2019-10-23T15:44:31.000-07:00
diff --git a/Gemfile b/Gemfile
@@ -83,5 +83,5 @@ group :production do
 end
 
 gem 'newrelic_rpm'
-gem 'rubocop', '~> 0.74.0'
+gem 'rubocop', '~> 0.75.1'
 gem 'rollbar'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    crass (1.0.4)
+    crass (1.0.5)
     css_parser (1.7.0)
       addressable
     database_cleaner (1.7.0)
@@ -222,8 +222,8 @@ GEM
     omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
-    parallel (1.17.0)
-    parser (2.6.4.0)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pg (0.20.0)
     pickadate-rails (3.5.6.0)
@@ -294,27 +294,27 @@ GEM
     rollbar (2.22.1)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.75.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -434,7 +434,7 @@ DEPENDENCIES
   rspec-collection_matchers
   rspec-its
   rspec-rails
-  rubocop (~> 0.74.0)
+  rubocop (~> 0.75.1)
   sass-rails (~> 5.0.1)
   selenium-webdriver
   shoulda-matchers (~> 4.1)
diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
@@ -17,7 +17,7 @@ def create
   end
 
   def update
-    @announcement.update_attributes(announcement_params)
+    @announcement.update(announcement_params)
     redirect_to admin_announcements_path, notice: 'Announcement successfully updated'
   end
 
diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
@@ -34,7 +34,7 @@ def show
   def update
     set_organisers(organiser_ids)
 
-    if @event.update_attributes(event_params)
+    if @event.update(event_params)
       redirect_to [:admin, @event], notice: 'You have just updated the event'
     else
       render 'edit', notice: 'Error'
diff --git a/app/controllers/admin/meeting_invitations_controller.rb b/app/controllers/admin/meeting_invitations_controller.rb
@@ -5,7 +5,7 @@ def update
     status = params.permit(:attendance_status)[:attendance_status]
     attended = params.permit(:attended)[:attended]
 
-    @invitation.update_attributes(attending: status, attended: attended)
+    @invitation.update(attending: status, attended: attended)
 
     return redirect_to [:admin, @invitation.meeting],
                        notice: t('admin.messages.invitation.update_rsvp', name: @invitation.member.full_name)
diff --git a/app/controllers/admin/meetings_controller.rb b/app/controllers/admin/meetings_controller.rb
@@ -30,7 +30,7 @@ def update
     set_organisers(organiser_ids)
     set_chapters(chapter_ids)
 
-    if @meeting.update_attributes(meeting_params)
+    if @meeting.update(meeting_params)
       redirect_to [:admin, @meeting], notice: t('admin.messages.meeting.updated')
     else
       flash[:notice] = @meeting.errors.full_messages.join('<br/>')
diff --git a/app/controllers/admin/sponsors_controller.rb b/app/controllers/admin/sponsors_controller.rb
@@ -36,7 +36,7 @@ def edit
   end
 
   def update
-    @sponsor.update_attributes(sponsor_params)
+    @sponsor.update(sponsor_params)
     redirect_to admin_sponsor_path(@sponsor), notice: 'Updated!'
   end
 
diff --git a/app/controllers/admin/workshops_controller.rb b/app/controllers/admin/workshops_controller.rb
@@ -50,7 +50,7 @@ def update
     @workshop = Workshop.find(params[:id])
     authorize @workshop
 
-    @workshop.update_attributes(workshop_params)
+    @workshop.update(workshop_params)
 
     set_organisers(organiser_ids)
     set_host(host_id)
diff --git a/app/controllers/concerns/invitation_controller_concerns.rb b/app/controllers/concerns/invitation_controller_concerns.rb
@@ -23,7 +23,7 @@ def accept
 
       @workshop = WorkshopPresenter.new(@invitation.workshop)
       if (@invitation.for_student? && @workshop.student_spaces?) || (@invitation.for_coach? && @workshop.coach_spaces?)
-        @invitation.update_attributes(attending: true, rsvp_time: Time.zone.now)
+        @invitation.update(attending: true, rsvp_time: Time.zone.now)
         @invitation.waiting_list.destroy if @invitation.waiting_list.present?
         WorkshopInvitationMailer.attending(@invitation.workshop,
                                            @invitation.member,
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -51,7 +51,7 @@ def rsvp
     invitation = member.invitations.where(event: @event, role: 'Student').try(:first)
     invitation ||= Invitation.create(event: @event, member: member, role: 'Student')
 
-    invitation.update_attributes attending: true
+    invitation.update(attending: true)
     head :ok
   end
 
diff --git a/app/controllers/invitation_controller.rb b/app/controllers/invitation_controller.rb
@@ -24,7 +24,7 @@ def update_note
 
   def accept_with_note
     @workshop = WorkshopPresenter.new(@invitation.workshop)
-    @invitation.update_attributes(note: params[:workshop_invitation][:note], rsvp_time: Time.zone.now)
+    @invitation.update(note: params[:workshop_invitation][:note], rsvp_time: Time.zone.now)
 
     if @workshop.student_spaces?
       return redirect_to :back, notice: 'You have already RSVPd or joined the waitlist for this workshop.' if @workshop.attendee?(current_user) || @workshop.waitlisted?(current_user)
diff --git a/app/controllers/member/jobs_controller.rb b/app/controllers/member/jobs_controller.rb
@@ -32,15 +32,15 @@ def edit
   end
 
   def submit
-    @job.update_attributes(submitted: true)
+    @job.update(submitted: true)
     @job.pending!
 
     flash[:notice] = I18n.t('job.messages.submitted')
     redirect_to member_jobs_path
   end
 
   def update
-    if @job.update_attributes(job_params)
+    if @job.update(job_params)
       redirect_to member_job_path(@job.id), notice: I18n.t('job.messages.updated')
     else
       flash['notice'] = @job.errors.full_messages.join('<br>')
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
@@ -14,7 +14,7 @@ def step1
     @suppress_notices = true
     @member = current_user
     if request.post? || request.put?
-      if @member.update_attributes(member_params)
+      if @member.update(member_params)
         return redirect_to step2_member_path
       end
     end
@@ -37,7 +37,7 @@ def profile
   def update
     @member = current_user
 
-    if @member.update_attributes(member_params)
+    if @member.update(member_params)
       notice = 'Your details have been updated.'
       return redirect_to profile_path, notice: notice
     else
diff --git a/app/models/feedback.rb b/app/models/feedback.rb
@@ -24,7 +24,7 @@ def self.submit_feedback(params, token)
     feedback.workshop = feedback_request.workshop
 
     if feedback.valid? && !feedback_request.submited
-      feedback_request.update_attributes(submited: true)
+      feedback_request.update(submited: true)
       feedback.save
     else
       false
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -2,11 +2,13 @@
 %html{ lang: 'en' }
   %head
     = render partial: 'layouts/meta'
+    = content_for :meta_tags
+
     %link{ rel: 'image_src', href: 'http://codebar.io/images/logo-square.png', :alt => "codebar logo" }
 
     %title codebar.io
     = favicon_link_tag 'favicon.ico'
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': true
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': true
     = javascript_include_tag 'vendor/modernizr'
     = javascript_include_tag 'application', 'data-turbolinks-track': true
     %link{ href: 'https://fonts.googleapis.com/css?family=Open+Sans:400,300', rel:'stylesheet', type:'text/css' }
diff --git a/app/views/workshops/_meta_tags.html.haml b/app/views/workshops/_meta_tags.html.haml
@@ -0,0 +1,9 @@
+- content_for :meta_tags do
+  - title = "Workshop at #{workshop.host.name}"
+  - description = "codebar #{workshop.chapter.name} workshop at #{workshop.host.name} on #{humanize_date(workshop.date_and_time, with_time: true)}"
+  %meta{ property: 'twitter:card', content: 'summary' }
+  %meta{ property: 'twitter:image', content: 'https://codebar.io/images/twitter-summary-card-image.png' }
+  %meta{ property: 'twitter:site', content: '@codebar' }
+  %meta{ property: 'twitter:title', content: title }
+  %meta{ property: 'twitter:description', content: description }
+  %meta{ property: 'twitter:image:alt', content: 'codebar logo' }
diff --git a/app/views/workshops/show.html.haml b/app/views/workshops/show.html.haml
@@ -1,3 +1,5 @@
+= render partial: 'meta_tags', locals: { workshop: @workshop }
+
 .stripe.reverse
   .row
     .large-12.columns
diff --git a/public/images/twitter-summary-card-image.png b/public/images/twitter-summary-card-image.png
