glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'feature/no-cancancan' into develop

Browse source
This commit is contained in:
Connor Turland 2016-03-24 20:47:35 -07:00
parent 42eea78bc4 34d3a80db1
commit 540b35c757
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -7,7 +7,6 @@ gem 'devise'
gem 'redis' gem 'redis'
gem 'pg' gem 'pg'
gem 'pundit' gem 'pundit'
gem 'cancan'
gem 'pundit_extra' gem 'pundit_extra'
gem 'doorkeeper' gem 'doorkeeper'
gem 'formula' gem 'formula'
@ -18,7 +17,7 @@ gem 'best_in_place' #in-place editing
gem 'kaminari' # pagination gem 'kaminari' # pagination
gem 'uservoice-ruby' gem 'uservoice-ruby'
gem 'dotenv' gem 'dotenv'
gem 'snorlax', '~> 0.1.3' gem 'snorlax'
gem 'httparty' gem 'httparty'
gem 'sequenced', '~> 2.0.0' gem 'sequenced', '~> 2.0.0'
gem 'active_model_serializers', '~> 0.8.1' gem 'active_model_serializers', '~> 0.8.1'

18
Gemfile.lock
View file

@ -57,8 +57,6 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.2) builder (3.2.2)
byebug (8.2.2) byebug (8.2.2)
cancan (1.6.10)
cancancan (1.10.1)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
cocaine (0.5.8) cocaine (0.5.8)
@ -125,10 +123,12 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
loofah (2.0.3) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.3) mail (2.6.4)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 4)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.99.1) mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mimemagic (0.3.0) mimemagic (0.3.0)
mini_portile2 (2.0.0) mini_portile2 (2.0.0)
minitest (5.8.4) minitest (5.8.4)
@ -193,7 +193,7 @@ GEM
activesupport (= 4.2.4) activesupport (= 4.2.4)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (11.1.0) rake (11.1.1)
redis (3.2.2) redis (3.2.2)
responders (2.1.1) responders (2.1.1)
railties (>= 4.2.0, < 5.1) railties (>= 4.2.0, < 5.1)
@ -232,8 +232,7 @@ GEM
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.0)
slop (3.6.0) slop (3.6.0)
snorlax (0.1.4) snorlax (0.1.5)
cancancan (~> 1.10.1)
rails (> 4.1) rails (> 4.1)
sprockets (3.5.2) sprockets (3.5.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
@ -267,7 +266,6 @@ DEPENDENCIES
best_in_place best_in_place
better_errors better_errors
binding_of_caller binding_of_caller
cancan
coffee-rails coffee-rails
delayed_job (~> 4.0.2) delayed_job (~> 4.0.2)
delayed_job_active_record (~> 4.0.1) delayed_job_active_record (~> 4.0.1)
@ -300,7 +298,7 @@ DEPENDENCIES
sequenced (~> 2.0.0) sequenced (~> 2.0.0)
shoulda-matchers shoulda-matchers
simplecov simplecov
snorlax (~> 0.1.3) snorlax
tunemygc tunemygc
uglifier uglifier
uservoice-ruby uservoice-ruby

1
app/controllers/api/restful_controller.rb
View file

@ -4,7 +4,6 @@ class API::RestfulController < ActionController::Base
snorlax_used_rest! snorlax_used_rest!
rescue_from(Pundit::NotAuthorizedError) { |e| respond_with_standard_error e, 403 }
load_and_authorize_resource only: [:show, :update, :destroy] load_and_authorize_resource only: [:show, :update, :destroy]
def create def create