Skip to content

Commit 9885683

Browse files
committed
Update Gems
1 parent a2aa175 commit 9885683

File tree

5 files changed

+79
-79
lines changed

5 files changed

+79
-79
lines changed

Gemfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ gem "pg", group: :production
1010

1111
# Use SCSS for stylesheets
1212
gem "sass-rails"
13-
gem "bootstrap-sass", "~> 3.3.1"
13+
gem "bootstrap-sass", "~> 3.3"
1414
# Use Uglifier as compressor for JavaScript assets
15-
gem "uglifier", "~> 2.7.2"
15+
gem "uglifier"
1616
# Use CoffeeScript for .js.coffee assets and views
1717
gem "coffee-rails"
1818
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@ -66,16 +66,14 @@ group :development, :test do
6666

6767
gem "factory_girl_rails"
6868

69+
# Linters and Security
6970
gem "rubocop", require: false
70-
7171
gem "ruby-lint", require: false
72-
7372
gem "scss_lint", require: false
74-
7573
gem "brakeman", require: false
76-
7774
gem "bundler-audit", require: false
7875

76+
# Allow printing with colors to terminal
7977
gem "rainbow"
8078

8179
# Favorite debugging gems

Gemfile.lock

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.3)
5-
actionpack (= 4.2.3)
6-
actionview (= 4.2.3)
7-
activejob (= 4.2.3)
4+
actionmailer (4.2.4)
5+
actionpack (= 4.2.4)
6+
actionview (= 4.2.4)
7+
activejob (= 4.2.4)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.3)
11-
actionview (= 4.2.3)
12-
activesupport (= 4.2.3)
10+
actionpack (4.2.4)
11+
actionview (= 4.2.4)
12+
activesupport (= 4.2.4)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.3)
18-
activesupport (= 4.2.3)
17+
actionview (4.2.4)
18+
activesupport (= 4.2.4)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.3)
24-
activesupport (= 4.2.3)
23+
activejob (4.2.4)
24+
activesupport (= 4.2.4)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.3)
27-
activesupport (= 4.2.3)
26+
activemodel (4.2.4)
27+
activesupport (= 4.2.4)
2828
builder (~> 3.1)
29-
activerecord (4.2.3)
30-
activemodel (= 4.2.3)
31-
activesupport (= 4.2.3)
29+
activerecord (4.2.4)
30+
activemodel (= 4.2.4)
31+
activesupport (= 4.2.4)
3232
arel (~> 6.0)
33-
activesupport (4.2.3)
33+
activesupport (4.2.4)
3434
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
@@ -39,11 +39,11 @@ GEM
3939
addressable (2.3.8)
4040
archive-zip (0.7.0)
4141
io-like (~> 0.3.0)
42-
arel (6.0.2)
43-
ast (2.0.0)
42+
arel (6.0.3)
43+
ast (2.1.0)
4444
astrolabe (1.3.1)
4545
parser (~> 2.2)
46-
autoprefixer-rails (5.2.1.1)
46+
autoprefixer-rails (6.0.3)
4747
execjs
4848
json
4949
awesome_print (1.6.1)
@@ -52,14 +52,15 @@ GEM
5252
bootstrap-sass (3.3.5.1)
5353
autoprefixer-rails (>= 5.0.0.1)
5454
sass (>= 3.3.0)
55-
brakeman (3.1.1)
55+
brakeman (3.1.2)
5656
erubis (~> 2.6)
5757
fastercsv (~> 1.5)
5858
haml (>= 3.0, < 5.0)
5959
highline (~> 1.6)
6060
multi_json (~> 1.2)
6161
ruby2ruby (>= 2.1.1, < 2.3.0)
6262
ruby_parser (~> 3.7.0)
63+
safe_yaml
6364
sass (~> 3.0)
6465
slim (>= 1.3.6, < 4.0)
6566
terminal-table (~> 1.4)
@@ -69,7 +70,7 @@ GEM
6970
thor (~> 0.18)
7071
byebug (5.0.0)
7172
columnize (= 0.9.0)
72-
capybara (2.4.4)
73+
capybara (2.5.0)
7374
mime-types (>= 1.16)
7475
nokogiri (>= 1.3.3)
7576
rack (>= 1.0.0)
@@ -78,7 +79,7 @@ GEM
7879
capybara-screenshot (1.0.11)
7980
capybara (>= 1.0, < 3)
8081
launchy
81-
childprocess (0.5.6)
82+
childprocess (0.5.7)
8283
ffi (~> 1.0, >= 1.0.11)
8384
chromedriver-helper (1.0.0)
8485
archive-zip (~> 0.7.0)
@@ -93,23 +94,23 @@ GEM
9394
coffee-script-source (1.9.1.1)
9495
columnize (0.9.0)
9596
connection_pool (2.2.0)
96-
coveralls (0.8.2)
97+
coveralls (0.8.3)
9798
json (~> 1.8)
9899
rest-client (>= 1.6.8, < 2)
99100
simplecov (~> 0.10.0)
100101
term-ansicolor (~> 1.3)
101102
thor (~> 0.19.1)
102-
database_cleaner (1.4.1)
103+
database_cleaner (1.5.1)
103104
debug_inspector (0.0.2)
104105
diff-lcs (1.2.5)
105106
docile (1.1.5)
106-
domain_name (0.5.24)
107+
domain_name (0.5.25)
107108
unf (>= 0.0.5, < 1.0.0)
108109
erubis (2.7.0)
109110
es5-shim-rails (4.0.1)
110111
actionpack (>= 3.1)
111112
railties (>= 3.1)
112-
execjs (2.5.2)
113+
execjs (2.6.0)
113114
factory_girl (4.5.0)
114115
activesupport (>= 3.0.0)
115116
factory_girl_rails (4.5.0)
@@ -119,41 +120,41 @@ GEM
119120
ffi (1.9.10)
120121
foreman (0.78.0)
121122
thor (~> 0.19.1)
122-
globalid (0.3.5)
123+
globalid (0.3.6)
123124
activesupport (>= 4.1.0)
124125
haml (4.0.7)
125126
tilt
126-
highline (1.7.7)
127+
highline (1.7.8)
127128
http-cookie (1.0.2)
128129
domain_name (~> 0.5)
129130
i18n (0.7.0)
130131
interception (0.5)
131132
io-like (0.3.0)
132-
jbuilder (2.3.1)
133+
jbuilder (2.3.2)
133134
activesupport (>= 3.0.0, < 5)
134135
multi_json (~> 1.2)
135136
json (1.8.3)
136-
kgio (2.9.3)
137+
kgio (2.10.0)
137138
launchy (2.4.3)
138139
addressable (~> 2.3)
139-
libv8 (3.16.14.11)
140-
loofah (2.0.2)
140+
libv8 (3.16.14.13)
141+
loofah (2.0.3)
141142
nokogiri (>= 1.5.9)
142143
mail (2.6.3)
143144
mime-types (>= 1.16, < 3)
144145
method_source (0.8.2)
145-
mime-types (2.6.1)
146+
mime-types (2.6.2)
146147
mini_portile (0.6.2)
147-
minitest (5.7.0)
148+
minitest (5.8.2)
148149
multi_json (1.11.2)
149-
netrc (0.10.3)
150+
netrc (0.11.0)
150151
nokogiri (1.6.6.2)
151152
mini_portile (~> 0.6.0)
152-
parser (2.2.2.6)
153+
parser (2.2.3.0)
153154
ast (>= 1.1, < 3.0)
154-
pg (0.18.2)
155+
pg (0.18.3)
155156
powerpack (0.1.1)
156-
pry (0.10.1)
157+
pry (0.10.3)
157158
coderay (~> 1.1.0)
158159
method_source (~> 0.8.1)
159160
slop (~> 3.4)
@@ -174,20 +175,20 @@ GEM
174175
rack (1.6.4)
175176
rack-test (0.6.3)
176177
rack (>= 1.0)
177-
rails (4.2.3)
178-
actionmailer (= 4.2.3)
179-
actionpack (= 4.2.3)
180-
actionview (= 4.2.3)
181-
activejob (= 4.2.3)
182-
activemodel (= 4.2.3)
183-
activerecord (= 4.2.3)
184-
activesupport (= 4.2.3)
178+
rails (4.2.4)
179+
actionmailer (= 4.2.4)
180+
actionpack (= 4.2.4)
181+
actionview (= 4.2.4)
182+
activejob (= 4.2.4)
183+
activemodel (= 4.2.4)
184+
activerecord (= 4.2.4)
185+
activesupport (= 4.2.4)
185186
bundler (>= 1.3.0, < 2.0)
186-
railties (= 4.2.3)
187+
railties (= 4.2.4)
187188
sprockets-rails
188189
rails-deprecated_sanitizer (1.0.3)
189190
activesupport (>= 4.2.0.alpha)
190-
rails-dom-testing (1.0.6)
191+
rails-dom-testing (1.0.7)
191192
activesupport (>= 4.2.0.beta, < 5.0)
192193
nokogiri (~> 1.6.0)
193194
rails-deprecated_sanitizer (>= 1.0.1)
@@ -197,10 +198,10 @@ GEM
197198
rails_serve_static_assets
198199
rails_stdout_logging
199200
rails_serve_static_assets (0.0.4)
200-
rails_stdout_logging (0.0.3)
201-
railties (4.2.3)
202-
actionpack (= 4.2.3)
203-
activesupport (= 4.2.3)
201+
rails_stdout_logging (0.0.4)
202+
railties (4.2.4)
203+
actionpack (= 4.2.4)
204+
activesupport (= 4.2.4)
204205
rake (>= 0.8.7)
205206
thor (>= 0.18.1, < 2.0)
206207
rainbow (2.0.0)
@@ -233,36 +234,37 @@ GEM
233234
rspec-mocks (~> 3.3.0)
234235
rspec-support (~> 3.3.0)
235236
rspec-support (3.3.0)
236-
rubocop (0.32.1)
237+
rubocop (0.34.2)
237238
astrolabe (~> 1.3)
238239
parser (>= 2.2.2.5, < 3.0)
239240
powerpack (~> 0.1)
240241
rainbow (>= 1.99.1, < 3.0)
241242
ruby-progressbar (~> 1.4)
242-
ruby-lint (2.0.4)
243+
ruby-lint (2.0.5)
243244
parser (~> 2.2)
244245
slop (~> 3.4, >= 3.4.7)
245246
ruby-progressbar (1.7.5)
246247
ruby2ruby (2.2.0)
247248
ruby_parser (~> 3.1)
248249
sexp_processor (~> 4.0)
249-
ruby_parser (3.7.1)
250+
ruby_parser (3.7.2)
250251
sexp_processor (~> 4.1)
251252
rubyzip (1.1.7)
252-
sass (3.4.18)
253-
sass-rails (5.0.3)
253+
safe_yaml (1.0.4)
254+
sass (3.4.19)
255+
sass-rails (5.0.4)
254256
railties (>= 4.0.0, < 5.0)
255257
sass (~> 3.1)
256258
sprockets (>= 2.8, < 4.0)
257259
sprockets-rails (>= 2.0, < 4.0)
258-
tilt (~> 1.1)
259-
scss_lint (0.40.1)
260+
tilt (>= 1.1, < 3)
261+
scss_lint (0.42.2)
260262
rainbow (~> 2.0)
261-
sass (~> 3.4.1)
263+
sass (~> 3.4.15)
262264
sdoc (0.4.1)
263265
json (~> 1.7, >= 1.7.7)
264266
rdoc (~> 4.0)
265-
selenium-webdriver (2.47.1)
267+
selenium-webdriver (2.48.1)
266268
childprocess (~> 0.5)
267269
multi_json (~> 1.0)
268270
rubyzip (~> 1.0)
@@ -277,16 +279,16 @@ GEM
277279
temple (~> 0.7.3)
278280
tilt (>= 1.3.3, < 2.1)
279281
slop (3.6.0)
280-
spring (1.3.6)
282+
spring (1.4.0)
281283
spring-commands-rspec (1.0.4)
282284
spring (>= 0.9.1)
283-
sprockets (3.2.0)
284-
rack (~> 1.0)
285-
sprockets-rails (2.3.2)
285+
sprockets (3.4.0)
286+
rack (> 1, < 3)
287+
sprockets-rails (2.3.3)
286288
actionpack (>= 3.0)
287289
activesupport (>= 3.0)
288290
sprockets (>= 2.8, < 4.0)
289-
sqlite3 (1.3.10)
291+
sqlite3 (1.3.11)
290292
temple (0.7.6)
291293
term-ansicolor (1.3.2)
292294
tins (~> 1.0)
@@ -296,7 +298,7 @@ GEM
296298
ref
297299
thor (0.19.1)
298300
thread_safe (0.3.5)
299-
tilt (1.4.1)
301+
tilt (2.0.1)
300302
tins (1.6.0)
301303
turbolinks (2.5.3)
302304
coffee-rails
@@ -328,7 +330,7 @@ PLATFORMS
328330
DEPENDENCIES
329331
autoprefixer-rails
330332
awesome_print
331-
bootstrap-sass (~> 3.3.1)
333+
bootstrap-sass (~> 3.3)
332334
brakeman
333335
bundler-audit
334336
capybara
@@ -366,7 +368,7 @@ DEPENDENCIES
366368
sqlite3
367369
therubyracer
368370
turbolinks
369-
uglifier (~> 2.7.2)
371+
uglifier
370372
unicorn
371373
web-console
372374

config.ru

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# This file is used by Rack-based servers to start the application.
22

3-
require ::File.expand_path("../config/environment", __FILE__)
3+
require ::File.expand_path("../config/environment", __FILE__)
44
run Rails.application

config/environments/test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
config.eager_load = false
1414

1515
# Configure static asset server for tests with Cache-Control for performance.
16-
config.serve_static_files = true
16+
config.serve_static_files = true
1717
config.static_cache_control = "public, max-age=3600"
1818

1919
# Show full error reports and disable caching.

spec/rails_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is copied to spec/ when you run "rails generate rspec:install"
22
ENV["RAILS_ENV"] ||= "test"
33
require "coveralls"
4-
Coveralls.wear!("rails") # must occur before any of your application code is required
4+
Coveralls.wear!("rails") # must occur before any of your application code is required
55
require "spec_helper"
66
require File.expand_path("../../config/environment", __FILE__)
77
require "rspec/rails"

0 commit comments

Comments
 (0)