Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

ruby '~> 2.3.3'

gem 'rails', '~> 5.0.0'
gem 'rails', '~> 5.1.3'

gem 'ahoy_matey'
gem 'american_date'
Expand Down
78 changes: 39 additions & 39 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ GIT

GIT
remote: https://github.com/18F/redis-session-store.git
revision: 101df477da93d47cbd61fe0ead8ddca6c60ce48e
revision: 7400dcc1c12f458da5c5dabb0fdc7ca789a66f0b
branch: master
specs:
redis-session-store (0.9.1)
actionpack (>= 3, < 5.1)
actionpack (>= 3, < 5.2)
redis (~> 3)

GIT
Expand Down Expand Up @@ -62,39 +62,39 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.5)
actionpack (= 5.0.5)
nio4r (>= 1.2, < 3.0)
actioncable (5.1.3)
actionpack (= 5.1.3)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.5)
actionpack (= 5.0.5)
actionview (= 5.0.5)
activejob (= 5.0.5)
actionmailer (5.1.3)
actionpack (= 5.1.3)
actionview (= 5.1.3)
activejob (= 5.1.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.5)
actionview (= 5.0.5)
activesupport (= 5.0.5)
actionpack (5.1.3)
actionview (= 5.1.3)
activesupport (= 5.1.3)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.5)
activesupport (= 5.0.5)
actionview (5.1.3)
activesupport (= 5.1.3)
builder (~> 3.1)
erubis (~> 2.7.0)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.5)
activesupport (= 5.0.5)
activejob (5.1.3)
activesupport (= 5.1.3)
globalid (>= 0.3.6)
activemodel (5.0.5)
activesupport (= 5.0.5)
activerecord (5.0.5)
activemodel (= 5.0.5)
activesupport (= 5.0.5)
arel (~> 7.0)
activesupport (5.0.5)
activemodel (5.1.3)
activesupport (= 5.1.3)
activerecord (5.1.3)
activemodel (= 5.1.3)
activesupport (= 5.1.3)
arel (~> 8.0)
activesupport (5.1.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
Expand All @@ -118,7 +118,7 @@ GEM
gyoku (>= 0.4.0)
nokogiri
american_date (1.1.1)
arel (7.1.4)
arel (8.0.0)
ast (2.3.0)
aws-sdk-core (2.10.23)
aws-sigv4 (~> 1.0)
Expand Down Expand Up @@ -424,17 +424,17 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (5.0.5)
actioncable (= 5.0.5)
actionmailer (= 5.0.5)
actionpack (= 5.0.5)
actionview (= 5.0.5)
activejob (= 5.0.5)
activemodel (= 5.0.5)
activerecord (= 5.0.5)
activesupport (= 5.0.5)
rails (5.1.3)
actioncable (= 5.1.3)
actionmailer (= 5.1.3)
actionpack (= 5.1.3)
actionview (= 5.1.3)
activejob (= 5.1.3)
activemodel (= 5.1.3)
activerecord (= 5.1.3)
activesupport (= 5.1.3)
bundler (>= 1.3.0)
railties (= 5.0.5)
railties (= 5.1.3)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
Expand All @@ -451,9 +451,9 @@ GEM
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_layout (1.0.41)
railties (5.0.5)
actionpack (= 5.0.5)
activesupport (= 5.0.5)
railties (5.1.3)
actionpack (= 5.1.3)
activesupport (= 5.1.3)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand Down Expand Up @@ -717,7 +717,7 @@ DEPENDENCIES
rack-mini-profiler
rack-test
rack_session_access
rails (~> 5.0.0)
rails (~> 5.1.3)
rails-controller-testing
rails-erd
rails_layout
Expand Down
2 changes: 2 additions & 0 deletions app/jobs/application_job.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class ApplicationJob < ActiveJob::Base
end
2 changes: 1 addition & 1 deletion app/jobs/sms_otp_sender_job.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class SmsOtpSenderJob < ActiveJob::Base
class SmsOtpSenderJob < ApplicationJob
queue_as :sms

def perform(code:, phone:, otp_created_at:)
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/vendor_validator_job.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class VendorValidatorJob < ActiveJob::Base
class VendorValidatorJob < ApplicationJob
queue_as :idv

def perform(result_id:, vendor_validator_class:, vendor:, vendor_params:, applicant_json:,
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/voice_otp_sender_job.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class VoiceOtpSenderJob < ActiveJob::Base
class VoiceOtpSenderJob < ApplicationJob
queue_as :voice

def perform(code:, phone:, otp_created_at:)
Expand Down
2 changes: 1 addition & 1 deletion app/models/app_setting.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AppSetting < ActiveRecord::Base
class AppSetting < ApplicationRecord
validates :name, presence: true, uniqueness: true

validates :value,
Expand Down
3 changes: 3 additions & 0 deletions app/models/application_record.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
end
2 changes: 1 addition & 1 deletion app/models/authorization.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Authorization < ActiveRecord::Base
class Authorization < ApplicationRecord
belongs_to :user
validates :user_id, :uid, :provider, presence: true
validates :uid, uniqueness: { scope: :provider, case_sensitive: false }
Expand Down
4 changes: 2 additions & 2 deletions app/models/concerns/user_encrypted_attribute_overrides.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ def create_fingerprint(email)
# use email_fingerprint_changed? instead of email_changed?
# This is necessary because email is no longer an ActiveRecord
# attribute and all the *_changed and *_was magic no longer works.
def email_changed?
def will_save_change_to_email?
email_fingerprint_changed?
end

def email_was
def email_in_database
EncryptedAttribute.new(encrypted_email_was).decrypted if encrypted_email_was.present?
end

Expand Down
2 changes: 1 addition & 1 deletion app/models/event.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Event < ActiveRecord::Base
class Event < ApplicationRecord
belongs_to :user

enum event_type: {
Expand Down
2 changes: 1 addition & 1 deletion app/models/identity.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Identity < ActiveRecord::Base
class Identity < ApplicationRecord
include NonNullUuid

belongs_to :user
Expand Down
2 changes: 1 addition & 1 deletion app/models/otp_requests_tracker.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class OtpRequestsTracker < ActiveRecord::Base
class OtpRequestsTracker < ApplicationRecord
def self.find_or_create_with_phone(phone)
tries ||= 1
phone ||= phone.strip
Expand Down
2 changes: 1 addition & 1 deletion app/models/profile.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Profile < ActiveRecord::Base
class Profile < ApplicationRecord
belongs_to :user

validates :active, uniqueness: { scope: :user_id, if: :active? }
Expand Down
2 changes: 1 addition & 1 deletion app/models/service_provider.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'fingerprinter'

class ServiceProvider < ActiveRecord::Base
class ServiceProvider < ApplicationRecord
scope(:active, -> { where(active: true) })

def self.from_issuer(issuer)
Expand Down
2 changes: 1 addition & 1 deletion app/models/service_provider_request.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ServiceProviderRequest < ActiveRecord::Base
class ServiceProviderRequest < ApplicationRecord
def self.from_uuid(uuid)
find_by(uuid: uuid) || NullServiceProviderRequest.new
end
Expand Down
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class User < ActiveRecord::Base
class User < ApplicationRecord
include NonNullUuid

after_validation :set_default_role, if: :new_record?
Expand Down
2 changes: 1 addition & 1 deletion app/models/usps_confirmation.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class UspsConfirmation < ActiveRecord::Base
class UspsConfirmation < ApplicationRecord
def decrypted_entry
UspsConfirmationEntry.new_from_encrypted(entry)
end
Expand Down
Loading