hackathon_manager 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 220ec7094ad0a190a71e4064736d8c707558cbd48775941022294f9aa6b4b14f
-  data.tar.gz: 36170ae1c9b391f39aa44a0abd3aeefec5eed045b3bfd24822114d76e5ee5392
+  metadata.gz: ac76ddc635787194b110815a1d4644597c6764de671879e922f6aa16cdb95c4f
+  data.tar.gz: 322bfb6e07da66de298b84d5340c27b2955ce4e70b63a612809f66e05d1c973a
 SHA512:
-  metadata.gz: 87b23b3213fe9e6be20e4abb2d9649d615dbf48ff01c2a711bd938e4b15f5076f311ee524e5470f46ada7119a3bd952034f2d8b58ba4699cc17b908578a97df9
-  data.tar.gz: 259d7ca3386713bc78a14d09ff8f0610833d14fd606c3ca36389204be3d9a5681604bdebb1089e9b5f90fa2f988e2ea16608caae2bc41f9f2ec5a3da609d1176
+  metadata.gz: 3ebb6b641937dc02641948d780a63a6e4bbd62537883eee58f98d09e3e329ea4d19a5fb77e70a36eb0110c70b2d5e652d56effee3528ccd476fa57190f9b5a83
+  data.tar.gz: 839c8439546cffd2efba661f119b1fbdbff1c834944296cdaea6ce12b3427adfccdf37c6c591cc65f5c245fd465e004dd6e578069c281bb90453c7733cacb4e1

data/README.md

@@ -35,7 +35,7 @@ Steps to get the basic flow working:
 
 2. Once you have at least one user in the system, you can promote them to an admin to access the management interface. Open up a console session with `bin/rails console`:
 ```ruby
->> User.last.update_attribute(:admin, true)
+>> User.last.update_attribute(:role, :admin)
 => true
 ```
 

data/app/assets/javascripts/hackathon_manager/manage/lib/setupDataTables.js

@@ -27,7 +27,8 @@ var setupDataTables = function() {
     columns    : [
       { orderable: true, data: 'id', visible: false },
       { orderable: true, data: 'email' },
-      { orderable: true, data: 'admin_limited_access' }
+      { orderable: true, data: 'role' },
+      { orderable: true, data: 'created_at' }
     ]
   });
 

data/app/controllers/manage/admins_controller.rb

@@ -4,7 +4,7 @@ class Manage::AdminsController < Manage::ApplicationController
   respond_to :html, :json
 
   def index
-    respond_with(:manage, User.where(admin: true))
+    respond_with(:manage, User.where(role: [:admin, :admin_limited_access, :event_tracking]))
   end
 
   def datatable
@@ -26,7 +26,6 @@ class Manage::AdminsController < Manage::ApplicationController
   def create
     @user = ::User.new(user_params.merge(password: Devise.friendly_token.first(10)))
     if @user.save
-      @user.update_attribute(:admin, true)
       @user.send_reset_password_instructions
     end
     respond_with(:manage, @user, location: manage_admins_path)
@@ -46,7 +45,7 @@ class Manage::AdminsController < Manage::ApplicationController
 
   def user_params
     params.require(:user).permit(
-      :email, :password, :password_confirmation, :remember_me, :admin_limited_access
+      :email, :password, :password_confirmation, :remember_me, :role
     )
   end
 

data/app/controllers/manage/application_controller.rb

@@ -1,15 +1,19 @@
 class Manage::ApplicationController < ApplicationController
   before_action :logged_in
+  before_action :require_admin_or_limited_admin
   before_action :limit_admin_access, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
   skip_before_action :verify_authenticity_token, if: :json_request?
 
   def logged_in
     authenticate_user!
-    return redirect_to root_path unless current_user.try(:admin?)
+  end
+
+  def require_admin_or_limited_admin
+    return redirect_to root_path unless current_user.try(:admin?) || current_user.try(:admin_limited_access?)
   end
 
   def limit_admin_access
-    redirect_to url_for(controller: controller_name, action: :index) if current_user.admin_limited_access
+    redirect_to url_for(controller: controller_name, action: :index) unless current_user.try(:admin?)
   end
 
   def json_request?

data/app/controllers/manage/configs_controller.rb

@@ -10,6 +10,6 @@ class Manage::ConfigsController < Manage::ApplicationController
   private
 
   def limit_access_admin
-    redirect_to manage_root_path if current_user.admin_limited_access
+    redirect_to manage_root_path unless current_user.admin?
   end
 end

data/app/controllers/manage/dashboard_controller.rb

@@ -32,7 +32,7 @@ class Manage::DashboardController < Manage::ApplicationController
     total_stats_data = {}
     total_count = Questionnaire.count
     rit_count = Questionnaire.where("school_id = \"2304\"").count
-    total_stats_data["Non-Applied Users"] = User.where(admin: false).count - total_count
+    total_stats_data["Non-Applied Users"] = User.without_questionnaire.count
     total_stats_data["Non-RIT Applications"] = total_count - rit_count
     total_stats_data["RIT Applications"] = rit_count
     render json: total_stats_data

data/app/controllers/manage/questionnaires_controller.rb

@@ -86,7 +86,7 @@ class Manage::QuestionnairesController < Manage::ApplicationController
   def convert_to_admin
     user = @questionnaire.user
     @questionnaire.destroy
-    user.update_attributes(admin: true, admin_limited_access: true)
+    user.update_attributes(role: :admin)
     redirect_to edit_manage_admin_path(user)
   end
 

data/app/controllers/manage/trackable_events_controller.rb

@@ -9,7 +9,7 @@ class Manage::TrackableEventsController < Manage::ApplicationController
     @trackable_events = TrackableEvent.all
     @params = {}
     if params[:trackable_event]
-      @params = params.require(:trackable_event).permit(:user_id, :band_id).reject{|_, v| v.blank?}
+      @params = params.require(:trackable_event).permit(:user_id, :band_id, :trackable_tag_id).reject { |_, v| v.blank? }
       @trackable_events = @trackable_events.where(@params)
     end
     respond_with(:manage, @trackable_events)
@@ -78,13 +78,18 @@ class Manage::TrackableEventsController < Manage::ApplicationController
     params.require(:trackable_event).permit(:band_id, :trackable_tag_id)
   end
 
+  # Permit everyone but regular users to access this controller
+  def require_admin_or_limited_admin
+    redirect_to root_path if current_user.try(:user?)
+  end
+
   # Permit limited-access admins (overrides Manage::ApplicationController#limit_admin_access)
   def limit_admin_access
   end
 
-  # If the admin is limited, scope changes only to those they created
+  # If the user isn't a full admin, scope changes only to those they created
   def scope_limited_admin_access
-    return if !current_user.admin_limited_access || @trackable_event.blank? || @trackable_event.user.blank?
+    return if current_user.admin? || @trackable_event.blank? || @trackable_event.user.blank?
     redirect_to manage_trackable_events_path, notice: 'You may not view events you did not create.' if @trackable_event.user != current_user
   end
 end

data/app/datatables/admin_datatable.rb

@@ -1,11 +1,12 @@
 class AdminDatatable < AjaxDatatablesRails::Base
-  def_delegators :@view, :link_to, :manage_admin_path, :bold
+  def_delegators :@view, :link_to, :manage_admin_path, :bold, :display_datetime
 
   def view_columns
     @view_columns ||= {
       id: { source: 'User.id' },
       email: { source: 'User.email' },
-      admin_limited_access: { source: 'User.admin_limited_access', searchable: false }
+      role: { source: 'User.role', searchable: false },
+      created_at: { source: 'User.created_at', searchable: false }
     }
   end
 
@@ -16,14 +17,15 @@ class AdminDatatable < AjaxDatatablesRails::Base
       {
         id: record.id,
         email: link_to(bold(record.email), manage_admin_path(record)),
-        admin_limited_access: record.admin_limited_access ? 'Limited Access' : 'Full Access'
+        role: record.role.titleize,
+        created_at: display_datetime(record.created_at)
       }
     end
   end
 
   # rubocop:disable Naming/AccessorMethodName
   def get_raw_records
-    User.where(admin: true)
+    User.where(role: [:admin, :admin_limited_access, :event_tracking])
   end
   # rubocop:enable Naming/AccessorMethodName
 end

data/app/datatables/questionnaire_datatable.rb

@@ -10,7 +10,7 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
       phone: { source: 'Questionnaire.phone' },
       gender: { source: 'Questionnaire.gender' },
       date_of_birth: { source: 'Questionnaire.date_of_birth', searchable: false },
-      admin: { source: 'User.admin', cond: :eq, searchable: false },
+      role: { source: 'User.role', cond: :eq, searchable: false },
       acc_status: { source: 'Questionnaire.acc_status', searchable: true },
       checked_in: { source: 'Questionnaire.checked_in_at', searchable: false },
       school: { source: 'School.name' },
@@ -34,7 +34,7 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
   def data
     records.map do |record|
       {
-        bulk: current_user.admin_limited_access ? '' : "<input type=\"checkbox\" data-bulk-row-edit=\"#{record.id}\">".html_safe,
+        bulk: current_user.admin? ? "<input type=\"checkbox\" data-bulk-row-edit=\"#{record.id}\">".html_safe : '',
         link: link_to('<i class="fa fa-search"></i>'.html_safe, manage_questionnaire_path(record)),
         note: note(record),
         id: record.id,

data/app/mailers/mailer.rb

@@ -16,7 +16,7 @@ class Mailer < ApplicationMailer
 
   def incomplete_reminder_email(user_id)
     @user = User.find_by_id(user_id)
-    return if @user.blank? || @user.admin || @user.questionnaire || Time.now.to_date > Rails.configuration.hackathon['last_day_to_apply']
+    return if @user.blank? || @user.admin? || @user.questionnaire || Time.now.to_date > Rails.configuration.hackathon['last_day_to_apply']
     mail(
       to: @user.email,
       subject: "Incomplete Application"

data/app/models/user.rb

@@ -13,6 +13,13 @@ class User < ApplicationRecord
 
   after_create :queue_reminder_email
 
+  enum role: { user: 0, event_tracking: 1, admin_limited_access: 2, admin: 3 }
+  after_initialize :set_default_role, if: :new_record?
+
+  def set_default_role
+    self.role ||= :user
+  end
+
   def active_for_authentication?
     true
   end
@@ -56,7 +63,11 @@ class User < ApplicationRecord
     end
   end
 
+  def self.non_admins
+    User.where.not(role: :admin).where.not(role: :admin_limited_access)
+  end
+
   def self.without_questionnaire
-    User.left_outer_joins(:questionnaire).where(questionnaires: { id: nil }, admin: false)
+    non_admins.left_outer_joins(:questionnaire).where(questionnaires: { id: nil })
   end
 end

data/app/views/layouts/manage/_page_title.html.haml

@@ -4,5 +4,5 @@
     - if defined?(subtitle) && subtitle.present?
       %small.text-muted= subtitle
 
-  - unless current_user.admin_limited_access?
+  - if current_user.try(:admin?)
     = yield

data/app/views/layouts/manage/application.html.haml

@@ -59,7 +59,7 @@
                 = active_link_to manage_trackable_tags_path, class: "nav-link" do
                   .fa.fa-tag.fa-fw.icon-space-r-half
                   Trackable Tags
-            - unless current_user.admin_limited_access?
+            - if current_user.admin?
               %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted
                 %span Advanced
               %ul.nav.flex-column.mb-2

data/app/views/manage/admins/_form.html.haml

@@ -11,7 +11,7 @@
 
     .form-inputs
       = f.input :email, input_html: { "data-validate" => "presence" }, required: true
-      = f.input :admin_limited_access, label: "Limited Access"
+      = f.input :role, collection: User.roles.to_a.collect{|c| [c[0].titleize, c[0]]}, include_blank: false
 
     .center
       = f.button :submit, value: ( @user.new_record? ? 'Create' : 'Save' ), class: 'btn-primary'

data/app/views/manage/admins/index.html.haml

@@ -7,5 +7,6 @@
       %tr
         %th ID
         %th Email
-        %th Access Level
+        %th Role
+        %th Registered on
     %tbody

data/app/views/manage/admins/show.html.haml

@@ -1,13 +1,17 @@
 = render "layouts/manage/page_title", title: @user.email do
-  - unless current_user.admin_limited_access
-    .btn-group
-      = link_to 'Edit', edit_manage_admin_path(@user), class: 'btn btn-sm btn-outline-secondary'
-      = link_to 'Delete', manage_admin_path(@user), method: :delete, data: { confirm: "Are you sure? #{@user.email} will be permanently deleted. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
+  .btn-group
+    = link_to 'Edit', edit_manage_admin_path(@user), class: 'btn btn-sm btn-outline-secondary'
+    = link_to 'Delete', manage_admin_path(@user), method: :delete, data: { confirm: "Are you sure? #{@user.email} will be permanently deleted. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
 
 %div
   %p
     %b Email address:
     = @user.email
+
+  %p
+    %b Role:
+    = @user.role.titleize
+
   %p
-    %b Access level:
-    = @user.admin_limited_access ? "Limited Access" : "Full Access"
+    %b Registered:
+    = display_datetime(@user.created_at)

data/app/views/manage/bus_lists/show.html.haml

@@ -9,8 +9,6 @@
       .dropdown-menu.dropdown-menu-right{"aria-labelledby" => "title-actions"}
         = link_to 'Send Bus Notes Update', send_update_email_manage_bus_list_path(@bus_list), method: :patch, data: { confirm: "Are you sure? All passengers for \"#{@bus_list.name}\" will be immediatley emailed the current bus notes." }, class: 'dropdown-item'
         = link_to 'Create message (signed up passengers)', new_manage_message_path(type: 'bulk', recipients: ["bus-list::#{@bus_list.id}"]), class: 'dropdown-item'
-        = link_to 'Create message (eligible, not signed up)', new_manage_message_path(type: 'bulk', recipients: ["bus-list::#{@bus_list.id}"]), class: 'dropdown-item'
-        = link_to 'Create message (applied/not yet accepted)', new_manage_message_path(type: 'bulk', recipients: ["bus-list::#{@bus_list.id}"]), class: 'dropdown-item'
 
 .row
   .col-lg-6
@@ -71,14 +69,14 @@
             %td= link_to p.school.name, manage_school_path(p.school)
             %td= p.boarded_bus? ? '<span class="text-success">Yes</span>'.html_safe : 'No'
             %td= p.checked_in? ? '<span class="text-success">Yes</span>'.html_safe : 'No'
-            - if current_user.admin_limited_access
-              %td= p.is_bus_captain? ? "Yes" : "No"
-            - else
+            - if current_user.admin?
               %td
                 - if p.is_bus_captain?
                   = link_to "Remove", toggle_bus_captain_manage_bus_list_path(@bus_list, questionnaire_id: p.id, bus_captain: '0'), method: 'post', class: 'text-danger'
                 - else
                   = link_to "Promote", toggle_bus_captain_manage_bus_list_path(@bus_list, questionnaire_id: p.id, bus_captain: '1'), method: 'post', data: { confirm: "Are you sure you want to make #{p.full_name} a bus captain? They will receive a confirmation email." }
+            - else
+              %td= p.is_bus_captain? ? "Yes" : "No"
 
     - if @bus_list.needs_bus_captain
       %h4.mt-4.pb-2 Possible Bus Captains
@@ -91,7 +89,7 @@
             %th Email
             %th Phone Number
             %th School
-            - unless current_user.admin_limited_access
+            - if current_user.admin?
               %th Actions
         %tbody
           - @bus_list.passengers.select { |q| q.bus_captain_interest }.each do |p|
@@ -102,7 +100,7 @@
               %td= p.email
               %td= phone_link_to p.phone
               %td= link_to p.school.name, manage_school_path(p.school)
-              - unless current_user.admin_limited_access
+              - if current_user.admin?
                 %td
                   - if p.is_bus_captain?
                     = link_to "Remove Bus Captain", toggle_bus_captain_manage_bus_list_path(@bus_list, questionnaire_id: p.id, bus_captain: '0'), method: 'post', class: 'text-danger'

data/app/views/manage/dashboard/index.html.haml

@@ -11,11 +11,12 @@
 
 = render "layouts/manage/page_title", title: "Dashboard"
 
-.row
-  .col
-    #map
-    :javascript
-      $('#map').initMap();
+-#
+  .row
+    .col
+      #map
+      :javascript
+        $('#map').initMap();
 
 .row
   .col-7

data/app/views/manage/questionnaires/_checkin.html.haml

@@ -8,7 +8,7 @@
           %small
             = @questionnaire.acc_status_author_id ? @questionnaire.acc_status_author.email : "(no author)"
             = @questionnaire.acc_status_date ? display_datetime(@questionnaire.acc_status_date, in_sentence: true) : "(no date)"
-        - unless current_user.admin_limited_access?
+        - if current_user.admin?
           = bs_vertical_simple_form @questionnaire, url: url_for(action: "update_acc_status", controller: "questionnaires") do |f|
             = f.input :acc_status, as: :select, collection: Questionnaire::POSSIBLE_ACC_STATUS.invert, include_blank: false, label: "Acceptance Status:", hint: "Updating this status may trigger an automatic email to the applicant - see #{link_to('messages', manage_messages_path(anchor: 'triggered-email-overview'))} for details.".html_safe
             = f.button :submit, value: "Update Status", class: 'btn-primary'

data/app/views/manage/questionnaires/index.html.haml

@@ -6,7 +6,7 @@
     %thead
       %tr
         %th
-          - unless current_user.admin_limited_access?
+          - if current_user.admin?
             %input{ type: "checkbox", name: "select_allc", value: "1", data: { bulk_row_select: "" } }
         %th
         %th

data/app/views/manage/questionnaires/show.html.haml

@@ -9,14 +9,14 @@
         = render 'check_in_badge'
 
   .btn-group{role: "group"}
-    - unless current_user.admin_limited_access
+    - if current_user.admin?
       = link_to 'Edit', edit_manage_questionnaire_path(@questionnaire), class: 'btn btn-sm btn-outline-secondary'
-    - unless current_user.admin_limited_access
+    - if current_user.admin?
       .btn-group{role: "group"}
         %button.btn.btn-sm.btn-outline-secondary.dropdown-toggle#title-actions{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button"}
           .fa.fa-cog
         .dropdown-menu.dropdown-menu-right{"aria-labelledby" => "title-actions"}
-          = link_to 'Convert to Admin', convert_to_admin_manage_questionnaire_path(@questionnaire), method: :patch, data: { confirm: "Are you sure? The questionnaire for \"#{@questionnaire.full_name}\" will be permanently erased. This action is irreversible." }, class: 'dropdown-item'
+          = link_to 'Convert to Admin', convert_to_admin_manage_questionnaire_path(@questionnaire), method: :patch, data: { confirm: "Are you sure? The questionnaire for \"#{@questionnaire.full_name}\" will be permanently erased, and \"#{@questionnaire.email}\" will become an admin. This action is irreversible." }, class: 'dropdown-item'
 
 = render 'overview'
 

data/app/views/manage/trackable_events/index.html.haml

@@ -2,10 +2,12 @@
 
 = bs_horizontal_simple_form_for :trackable_event, method: 'get' do |f|
   .form-row
-    .col-auto
-      = f.input :user_id, collection: User.where(admin: true), label_method: :email, value_method: :id, include_blank: '(show all)', required: false, selected: @params['user_id']
     .col-auto
       = f.input :band_id, as: :string, required: false, input_html: { value: @params['band_id'] }, placeholder: '(show all)'
+    .col-auto
+      = f.input :trackable_tag_id, collection: TrackableTag.all, label_method: :name, value_method: :id, include_blank: '(show all)', required: false, selected: @params['trackable_tag_id']
+    .col-auto
+      = f.input :user_id, collection: User.where.not(role: :user), label_method: :email, value_method: :id, include_blank: '(show all)', required: false, selected: @params['user_id']
     .col-auto
       = f.button :submit, 'Filter', class: 'btn btn-primary'
 
@@ -26,7 +28,7 @@
         %td= trackable_event.trackable_tag.name
         %td= trackable_event.user.email
         %td= link_to 'Show', manage_trackable_event_path(trackable_event)
-        - unless current_user.admin_limited_access && current_user != trackable_event.user
+        - if current_user.admin? || current_user == trackable_event.user
           %td= link_to 'Edit', edit_manage_trackable_event_path(trackable_event)
           %td= link_to 'Destroy', manage_trackable_event_path(trackable_event), method: :delete, data: { confirm: 'Are you sure?' }
         - else

data/app/views/manage/trackable_tags/show.html.haml

@@ -27,5 +27,5 @@
         %td= trackable_event.band_id
         %td= trackable_event.user.email
         %td
-          - unless current_user.admin_limited_access && current_user != trackable_event.user
+          - if current_user.admin? || current_user == trackable_event.user
             = link_to 'Edit', edit_manage_trackable_event_path(trackable_event)

data/app/workers/bulk_message_worker.rb

@@ -27,9 +27,9 @@ class BulkMessageWorker
   def self.user_ids(type)
     case type
     when "all"
-      User.where(admin: false).pluck(:id)
+      User.non_admins.pluck(:id)
     when "incomplete"
-      User.where(admin: false).pluck(:id) - Questionnaire.pluck(:user_id)
+      User.non_admins.pluck(:id) - Questionnaire.pluck(:user_id)
     when "complete"
       Questionnaire.pluck(:user_id)
     when "accepted"

data/config/locales/en.yml

@@ -39,7 +39,7 @@ en:
           If many people have already RSVP'd, consider sending a message out to this bus list asking for interest as well.
         notes: Notes are shared with applicants. Supports Markdown and HTML.
       user:
-        admin_limited_access: Limited access prevents the admin from adding, modifying, or deleting any records. Modifications through the check-in process are allowed.
+        role: Limited access prevents the admin from adding, modifying, or deleting any records; modifications through the check-in process are allowed. Event tracking limits to only event tracking.
       message:
         type: Bulk emails are sent once, manually. Automated emails are sent upon a desired trigger/event.
         name: A friendly name to recognize this email. Applicants won't see this.

data/config/routes.rb

@@ -8,7 +8,7 @@ Rails.application.routes.draw do
 
   mount MailPreview => 'mail_view' if Rails.env.development?
 
-  authenticate :user, ->(u) { u.admin? && !u.admin_limited_access? } do
+  authenticate :user, ->(u) { u.admin? } do
     mount Sidekiq::Web => '/sidekiq'
     mount Blazer::Engine, at: "blazer"
   end

data/db/migrate/20190118204143_add_role_to_users.rb

@@ -0,0 +1,16 @@
+class AddRoleToUsers < ActiveRecord::Migration[5.2]
+  def up
+    add_column :users, :role, :integer, default: 0
+
+    User.where(admin: true).each do |user|
+      user.update_attribute(:role, :admin)
+    end
+
+    User.where(admin_limited_access: true).each do |user|
+      user.update_attribute(:role, :admin_limited_access)
+    end
+
+    remove_column :users, :admin, :boolean
+    remove_column :users, :admin_limited_access, :boolean
+  end
+end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.12.2'.freeze
+  VERSION = '0.13.0'.freeze
 end

data/test/factories/users.rb

@@ -4,21 +4,20 @@ FactoryBot.define do
       "foo#{n}@example.com"
     end
     password { "password" }
+    role { :user }
 
     factory :admin do
       sequence :email do |n|
         "admin#{n}@example.com"
       end
-      admin { true }
-      admin_limited_access { false }
+      role { :admin }
     end
 
     factory :limited_access_admin do
       sequence :email do |n|
         "limited_admin#{n}@example.com"
       end
-      admin { true }
-      admin_limited_access { true }
+      role { :admin_limited_access }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -707,6 +707,7 @@ files:
 - db/migrate/20190107232955_create_trackable_tags.rb
 - db/migrate/20190107233210_create_trackable_events.rb
 - db/migrate/20190113231044_refactor_bus_lists.rb
+- db/migrate/20190118204143_add_role_to_users.rb
 - db/schools.csv
 - db/seed_messages/questionnaire--accepted.md
 - db/seed_messages/questionnaire--denied.md