Skip to content

Commit e407da9

Browse files
author
Christopher Talib
authored
Merge pull request #275 from tosdr/sec/general-testing
[sec] Ran brakeman
2 parents 6d6c523 + 390035f commit e407da9

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

Gemfile.lock

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: git://github.com/activeadmin/activeadmin.git
3-
revision: ee49d3d2d13c3c871a2ce3fe62e29bbc35b5f697
3+
revision: dabd8b30874fe177dcc14e5ebda3fd7b892f3c72
44
specs:
55
activeadmin (2.0.0.alpha)
66
arbre (>= 1.1.1)
@@ -70,7 +70,7 @@ GEM
7070
arbre (1.1.1)
7171
activesupport (>= 3.0.0)
7272
arel (8.0.0)
73-
autoprefixer-rails (8.0.0)
73+
autoprefixer-rails (8.2.0)
7474
execjs
7575
babel-source (5.8.35)
7676
babel-transpiler (0.7.0)
@@ -82,22 +82,22 @@ GEM
8282
autoprefixer-rails (>= 5.2.1)
8383
sass (>= 3.3.4)
8484
builder (3.2.3)
85-
byebug (10.0.0)
85+
byebug (10.0.2)
8686
coderay (1.1.2)
8787
concurrent-ruby (1.0.5)
8888
crass (1.0.3)
89-
devise (4.4.1)
89+
devise (4.4.3)
9090
bcrypt (~> 3.0)
9191
orm_adapter (~> 0.1)
92-
railties (>= 4.1.0, < 5.2)
92+
railties (>= 4.1.0, < 6.0)
9393
responders
9494
warden (~> 1.2.3)
95-
erubi (1.7.0)
95+
erubi (1.7.1)
9696
execjs (2.7.0)
97-
ffi (1.9.22)
97+
ffi (1.9.23)
9898
figaro (1.1.1)
9999
thor (~> 0.14)
100-
font-awesome-sass (5.0.6.2)
100+
font-awesome-sass (5.0.9)
101101
sass (>= 3.2)
102102
formtastic (3.1.5)
103103
actionpack (>= 3.2.13)
@@ -136,7 +136,7 @@ GEM
136136
listen (3.0.8)
137137
rb-fsevent (~> 0.9, >= 0.9.4)
138138
rb-inotify (~> 0.9, >= 0.9.7)
139-
loofah (2.2.1)
139+
loofah (2.2.2)
140140
crass (~> 1.0.2)
141141
nokogiri (>= 1.5.9)
142142
mail (2.7.0)
@@ -146,22 +146,22 @@ GEM
146146
mini_portile2 (2.3.0)
147147
minitest (5.11.3)
148148
multi_json (1.13.1)
149-
nio4r (2.2.0)
149+
nio4r (2.3.0)
150150
nokogiri (1.8.2)
151151
mini_portile2 (~> 2.3.0)
152152
orm_adapter (0.5.0)
153-
paper_trail (8.1.2)
154-
activerecord (>= 4.2, < 5.2)
153+
paper_trail (9.0.0)
154+
activerecord (>= 4.2, < 5.3)
155155
request_store (~> 1.1)
156156
pg (0.21.0)
157157
polyamorous (1.3.3)
158158
activerecord (>= 3.0)
159-
postmark (1.10.0)
159+
postmark (1.11.0)
160160
json
161161
rake
162-
postmark-rails (0.15.0)
162+
postmark-rails (0.16.0)
163163
actionmailer (>= 3.0.0)
164-
postmark (~> 1.10.0)
164+
postmark (~> 1.11.0)
165165
pry (0.11.3)
166166
coderay (~> 1.1.0)
167167
method_source (~> 0.9.0)
@@ -175,7 +175,7 @@ GEM
175175
pundit (1.1.0)
176176
activesupport (>= 3.0.0)
177177
rack (2.0.4)
178-
rack-test (0.8.2)
178+
rack-test (1.0.0)
179179
rack (>= 1.0, < 3)
180180
rails (5.1.4)
181181
actioncable (= 5.1.4)
@@ -192,31 +192,31 @@ GEM
192192
rails-dom-testing (2.0.3)
193193
activesupport (>= 4.2.0)
194194
nokogiri (>= 1.6)
195-
rails-html-sanitizer (1.0.3)
196-
loofah (~> 2.0)
195+
rails-html-sanitizer (1.0.4)
196+
loofah (~> 2.2, >= 2.2.2)
197197
railties (5.1.4)
198198
actionpack (= 5.1.4)
199199
activesupport (= 5.1.4)
200200
method_source
201201
rake (>= 0.8.7)
202202
thor (>= 0.18.1, < 2.0)
203-
rake (12.3.0)
204-
ransack (1.8.7)
203+
rake (12.3.1)
204+
ransack (1.8.8)
205205
actionpack (>= 3.0)
206206
activerecord (>= 3.0)
207207
activesupport (>= 3.0)
208208
i18n
209209
polyamorous (~> 1.3.2)
210-
rb-fsevent (0.10.2)
210+
rb-fsevent (0.10.3)
211211
rb-inotify (0.9.10)
212212
ffi (>= 0.5.0, < 2)
213213
redis (4.0.1)
214-
request_store (1.4.0)
214+
request_store (1.4.1)
215215
rack (>= 1.4)
216216
responders (2.4.0)
217217
actionpack (>= 4.2.0, < 5.3)
218218
railties (>= 4.2.0, < 5.3)
219-
sass (3.5.5)
219+
sass (3.5.6)
220220
sass-listen (~> 4.0.0)
221221
sass-listen (4.0.0)
222222
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -251,7 +251,7 @@ GEM
251251
tilt (2.0.8)
252252
tzinfo (1.2.5)
253253
thread_safe (~> 0.1)
254-
uglifier (4.1.6)
254+
uglifier (4.1.8)
255255
execjs (>= 0.3.0, < 3)
256256
warden (1.2.7)
257257
rack (>= 1.0)

app/controllers/api/v1/base_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class Api::V1::BaseController < ActionController::Base
2+
protect_from_forgery with: :exception
23
include Pundit
3-
44
after_action :verify_authorized, except: :index
55
after_action :verify_policy_scoped, only: :index
66

app/controllers/api/v1/services_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def show
1010

1111
private
1212
def set_service
13-
@service = Service.find_by(params[:id])
13+
@service = Service.find(params[:id])
1414
authorize @service
1515
end
1616
end

0 commit comments

Comments
 (0)