Skip to content

Commit d6554cf

Browse files
committed
update gem versions
1 parent a18e0a1 commit d6554cf

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

Gemfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ GEM
3434
erubis (>= 2.6.6)
3535
binding_of_caller (0.7.2)
3636
debug_inspector (>= 0.0.1)
37-
bootstrap-sass (3.2.0.0)
37+
bootstrap-sass (3.2.0.1)
3838
sass (~> 3.2)
3939
builder (3.2.2)
4040
capybara (2.4.1)
@@ -49,10 +49,10 @@ GEM
4949
coffee-rails (4.0.1)
5050
coffee-script (>= 2.2.0)
5151
railties (>= 4.0.0, < 5.0)
52-
coffee-script (2.2.0)
52+
coffee-script (2.3.0)
5353
coffee-script-source
5454
execjs
55-
coffee-script-source (1.7.0)
55+
coffee-script-source (1.7.1)
5656
database_cleaner (1.3.0)
5757
debug_inspector (0.0.2)
5858
diff-lcs (1.2.5)
@@ -63,13 +63,13 @@ GEM
6363
factory_girl_rails (4.4.1)
6464
factory_girl (~> 4.4.0)
6565
railties (>= 3.0.0)
66-
faker (1.4.1)
66+
faker (1.4.2)
6767
i18n (~> 0.5)
6868
ffi (1.9.3)
69-
high_voltage (2.2.0)
69+
high_voltage (2.2.1)
7070
hike (1.2.3)
71-
i18n (0.6.9)
72-
jbuilder (2.1.2)
71+
i18n (0.6.11)
72+
jbuilder (2.1.3)
7373
activesupport (>= 3.0.0, < 5)
7474
multi_json (~> 1.2)
7575
jquery-rails (3.1.1)
@@ -85,7 +85,7 @@ GEM
8585
mini_portile (0.6.0)
8686
minitest (5.4.0)
8787
multi_json (1.10.1)
88-
nokogiri (1.6.2.1)
88+
nokogiri (1.6.3.1)
8989
mini_portile (= 0.6.0)
9090
polyglot (0.3.5)
9191
quiet_assets (1.0.3)
@@ -103,7 +103,7 @@ GEM
103103
bundler (>= 1.3.0, < 2.0)
104104
railties (= 4.1.4)
105105
sprockets-rails (~> 2.0)
106-
rails_layout (1.0.20)
106+
rails_layout (1.0.21)
107107
railties (4.1.4)
108108
actionpack (= 4.1.4)
109109
activesupport (= 4.1.4)
@@ -112,32 +112,32 @@ GEM
112112
rake (10.3.2)
113113
rdoc (4.1.1)
114114
json (~> 1.4)
115-
rspec-core (3.0.2)
115+
rspec-core (3.0.4)
116116
rspec-support (~> 3.0.0)
117-
rspec-expectations (3.0.2)
117+
rspec-expectations (3.0.4)
118118
diff-lcs (>= 1.2.0, < 2.0)
119119
rspec-support (~> 3.0.0)
120-
rspec-mocks (3.0.2)
120+
rspec-mocks (3.0.4)
121121
rspec-support (~> 3.0.0)
122-
rspec-rails (3.0.1)
122+
rspec-rails (3.0.2)
123123
actionpack (>= 3.0)
124124
activesupport (>= 3.0)
125125
railties (>= 3.0)
126126
rspec-core (~> 3.0.0)
127127
rspec-expectations (~> 3.0.0)
128128
rspec-mocks (~> 3.0.0)
129129
rspec-support (~> 3.0.0)
130-
rspec-support (3.0.2)
130+
rspec-support (3.0.4)
131131
rubyzip (1.1.6)
132132
sass (3.2.19)
133133
sass-rails (4.0.3)
134134
railties (>= 4.0.0, < 5.0)
135135
sass (~> 3.2.0)
136136
sprockets (~> 2.8, <= 2.11.0)
137137
sprockets-rails (~> 2.0)
138-
sdoc (0.4.0)
139-
json (~> 1.8)
140-
rdoc (~> 4.0, < 5.0)
138+
sdoc (0.4.1)
139+
json (~> 1.7, >= 1.7.7)
140+
rdoc (~> 4.0)
141141
selenium-webdriver (2.42.0)
142142
childprocess (>= 0.5.0)
143143
multi_json (~> 1.0)
@@ -162,9 +162,9 @@ GEM
162162
polyglot (>= 0.3.1)
163163
turbolinks (2.2.2)
164164
coffee-rails
165-
tzinfo (1.2.1)
165+
tzinfo (1.2.2)
166166
thread_safe (~> 0.1)
167-
uglifier (2.5.1)
167+
uglifier (2.5.3)
168168
execjs (>= 0.3.0)
169169
json (>= 1.8.0)
170170
websocket (1.0.7)

public/humans.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
Software: Ruby on Rails
1818

1919
/* GENERATED BY */
20-
RailsApps application template: http://railsapps.github.io/
20+
Rails Composer: http://railscomposer.com/

spec/rails_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# run as spec files by default. This means that files in spec/support that end
1010
# in _spec.rb will both be required and run as specs, causing the specs to be
1111
# run twice. It is recommended that you do not name files matching this glob to
12-
# end with _spec.rb. You can configure this pattern with with the --pattern
12+
# end with _spec.rb. You can configure this pattern with the --pattern
1313
# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
1414
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
1515

0 commit comments

Comments
 (0)