Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump nokogiri from 1.10.7 to 1.11.2 #7

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions Gemfile.lock
Expand Up @@ -83,15 +83,17 @@ GEM
method_source (0.9.2)
mimemagic (0.3.4)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_portile2 (2.5.0)
minitest (5.14.0)
msgpack (1.3.1)
nio4r (2.5.2)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
pg (1.2.2)
puma (4.3.1)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.1.2)
rack-cors (1.1.1)
rack (>= 2.0.0)
Expand Down
1 change: 1 addition & 0 deletions app/controllers/api/v1/registrations_controller.rb
@@ -1,5 +1,6 @@
module Api::V1
class RegistrationsController < ApplicationController
skip_before_action :verify_authenticity_token
def create
user = User.create!(
first_name: params['first_name'],
Expand Down
2 changes: 2 additions & 0 deletions app/controllers/concerns/application_controller.rb
Expand Up @@ -5,6 +5,8 @@ class ApplicationController < ActionController::Base

after_action :short_session

Rails.application.config.action_controller.forgery_protection_origin_check = false

def short_session
request.session_options = request.session_options.dup
request.session_options[:expire_after] = 14.days
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/cors.rb
Expand Up @@ -7,7 +7,7 @@

Rails.application.config.middleware.insert_before 0, Rack::Cors do
allow do
origins 'https://winnow-client.herokuapp.com'
origins '*', 'https://winnow-client.herokuapp.com', 'http://winnow-client.herokuapp.com'

resource '*',
headers: :any,
Expand Down