Skip to content

Commit a160ec4

Browse files
committed
Bump version number
1 parent 27ba72e commit a160ec4

File tree

3 files changed

+58
-57
lines changed

3 files changed

+58
-57
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22
ruby '2.0.0'
33
#ruby-gemset=railstutorial_rails_4_0
44

5-
gem 'rails', '4.0.1'
5+
gem 'rails', '4.0.2'
66
gem 'bootstrap-sass', '2.3.2.0'
77
gem 'bcrypt-ruby', '3.1.2'
88
gem 'faker', '1.1.2'

Gemfile.lock

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
GIT
22
remote: git://github.com/bmabey/database_cleaner.git
3-
revision: 6da38c4c1a565bbcc62ed9b84c2574537c6ebae2
3+
revision: 733849482546297c48f97b292cf3ad4e498eaad0
44
specs:
55
database_cleaner (1.2.0)
66

77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actionmailer (4.0.1)
11-
actionpack (= 4.0.1)
10+
actionmailer (4.0.2)
11+
actionpack (= 4.0.2)
1212
mail (~> 2.5.4)
13-
actionpack (4.0.1)
14-
activesupport (= 4.0.1)
13+
actionpack (4.0.2)
14+
activesupport (= 4.0.2)
1515
builder (~> 3.1.0)
1616
erubis (~> 2.7.0)
1717
rack (~> 1.5.2)
1818
rack-test (~> 0.6.2)
19-
activemodel (4.0.1)
20-
activesupport (= 4.0.1)
19+
activemodel (4.0.2)
20+
activesupport (= 4.0.2)
2121
builder (~> 3.1.0)
22-
activerecord (4.0.1)
23-
activemodel (= 4.0.1)
22+
activerecord (4.0.2)
23+
activemodel (= 4.0.2)
2424
activerecord-deprecated_finders (~> 1.0.2)
25-
activesupport (= 4.0.1)
25+
activesupport (= 4.0.2)
2626
arel (~> 4.0.0)
2727
activerecord-deprecated_finders (1.0.3)
28-
activesupport (4.0.1)
28+
activesupport (4.0.2)
2929
i18n (~> 0.6, >= 0.6.4)
3030
minitest (~> 4.2)
3131
multi_json (~> 1.3)
@@ -49,25 +49,25 @@ GEM
4949
timers (~> 1.1.0)
5050
childprocess (0.3.6)
5151
ffi (~> 1.0, >= 1.0.6)
52-
coderay (1.0.9)
52+
coderay (1.1.0)
5353
coffee-rails (4.0.1)
5454
coffee-script (>= 2.2.0)
5555
railties (>= 4.0.0, < 5.0)
5656
coffee-script (2.2.0)
5757
coffee-script-source
5858
execjs
5959
coffee-script-source (1.6.3)
60-
cucumber (1.3.8)
60+
cucumber (1.3.10)
6161
builder (>= 2.1.2)
6262
diff-lcs (>= 1.1.3)
63-
gherkin (~> 2.12.1)
63+
gherkin (~> 2.12)
6464
multi_json (>= 1.7.5, < 2.0)
6565
multi_test (>= 0.0.2)
6666
cucumber-rails (1.3.0)
6767
capybara (>= 1.1.2)
6868
cucumber (>= 1.1.8)
6969
nokogiri (>= 1.5.0)
70-
diff-lcs (1.2.4)
70+
diff-lcs (1.2.5)
7171
erubis (2.7.0)
7272
execjs (2.0.2)
7373
factory_girl (4.2.0)
@@ -82,7 +82,7 @@ GEM
8282
gherkin (2.12.2)
8383
multi_json (~> 1.3)
8484
growl (1.0.3)
85-
guard (2.2.2)
85+
guard (2.2.4)
8686
formatador (>= 0.2.4)
8787
listen (~> 2.1)
8888
lumberjack (~> 1.0)
@@ -96,14 +96,14 @@ GEM
9696
guard (>= 1.1)
9797
spork (>= 0.8.4)
9898
hike (1.2.3)
99-
i18n (0.6.5)
99+
i18n (0.6.9)
100100
jbuilder (1.0.2)
101101
activesupport (>= 3.0.0)
102102
jquery-rails (3.0.4)
103103
railties (>= 3.0, < 5.0)
104104
thor (>= 0.14, < 2.0)
105105
json (1.8.1)
106-
listen (2.2.0)
106+
listen (2.3.1)
107107
celluloid (>= 0.15.2)
108108
rb-fsevent (>= 0.9.3)
109109
rb-inotify (>= 0.9)
@@ -112,7 +112,7 @@ GEM
112112
mime-types (~> 1.16)
113113
treetop (~> 1.4.8)
114114
method_source (0.8.2)
115-
mime-types (1.25)
115+
mime-types (1.25.1)
116116
mini_portile (0.5.2)
117117
minitest (4.7.5)
118118
multi_json (1.8.2)
@@ -121,29 +121,29 @@ GEM
121121
mini_portile (~> 0.5.0)
122122
pg (0.15.1)
123123
polyglot (0.3.3)
124-
pry (0.9.12.2)
125-
coderay (~> 1.0.5)
124+
pry (0.9.12.4)
125+
coderay (~> 1.0)
126126
method_source (~> 0.8)
127127
slop (~> 3.4)
128128
rack (1.5.2)
129129
rack-test (0.6.2)
130130
rack (>= 1.0)
131-
rails (4.0.1)
132-
actionmailer (= 4.0.1)
133-
actionpack (= 4.0.1)
134-
activerecord (= 4.0.1)
135-
activesupport (= 4.0.1)
131+
rails (4.0.2)
132+
actionmailer (= 4.0.2)
133+
actionpack (= 4.0.2)
134+
activerecord (= 4.0.2)
135+
activesupport (= 4.0.2)
136136
bundler (>= 1.3.0, < 2.0)
137-
railties (= 4.0.1)
137+
railties (= 4.0.2)
138138
sprockets-rails (~> 2.0.0)
139139
rails_12factor (0.0.2)
140140
rails_serve_static_assets
141141
rails_stdout_logging
142142
rails_serve_static_assets (0.0.1)
143143
rails_stdout_logging (0.0.3)
144-
railties (4.0.1)
145-
actionpack (= 4.0.1)
146-
activesupport (= 4.0.1)
144+
railties (4.0.2)
145+
actionpack (= 4.0.2)
146+
activesupport (= 4.0.2)
147147
rake (>= 0.8.7)
148148
thor (>= 0.18.1, < 2.0)
149149
rake (10.1.0)
@@ -181,12 +181,12 @@ GEM
181181
multi_json (~> 1.0)
182182
rubyzip (< 1.0.0)
183183
websocket (~> 1.0.4)
184-
slop (3.4.6)
184+
slop (3.4.7)
185185
spork (1.0.0rc4)
186186
spork-rails (4.0.0)
187187
rails (>= 3.0.0, < 5)
188188
spork (>= 1.0rc0)
189-
sprockets (2.10.0)
189+
sprockets (2.10.1)
190190
hike (~> 1.2)
191191
multi_json (~> 1.0)
192192
rack (~> 1.0)
@@ -235,7 +235,7 @@ DEPENDENCIES
235235
jbuilder (= 1.0.2)
236236
jquery-rails (= 3.0.4)
237237
pg (= 0.15.1)
238-
rails (= 4.0.1)
238+
rails (= 4.0.2)
239239
rails_12factor (= 0.0.2)
240240
rspec-rails (= 2.13.1)
241241
sass-rails (= 4.0.1)

config/application.rb

+24-23
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
require File.expand_path('../boot', __FILE__)
1+
require File.expand_path('../boot', __FILE__)
22

3-
# Pick the frameworks you want:
4-
require "active_record/railtie"
5-
require "action_controller/railtie"
6-
require "action_mailer/railtie"
7-
require "sprockets/railtie"
8-
# require "rails/test_unit/railtie"
3+
# Pick the frameworks you want:
4+
require "active_record/railtie"
5+
require "action_controller/railtie"
6+
require "action_mailer/railtie"
7+
require "sprockets/railtie"
8+
# require "rails/test_unit/railtie"
99

10-
# Assets should be precompiled for production (so we don't need the gems loaded then)
11-
Bundler.require(*Rails.groups(assets: %w(development test)))
10+
# Assets should be precompiled for production (so we don't need the gems loaded then)
11+
Bundler.require(*Rails.groups(assets: %w(development test)))
1212

13-
module SampleApp
14-
class Application < Rails::Application
15-
# Settings in config/environments/* take precedence over those specified here.
16-
# Application configuration should go into files in config/initializers
17-
# -- all .rb files in that directory are automatically loaded.
13+
module SampleApp
14+
class Application < Rails::Application
15+
# Settings in config/environments/* take precedence over those specified here.
16+
# Application configuration should go into files in config/initializers
17+
# -- all .rb files in that directory are automatically loaded.
1818

19-
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
20-
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
21-
# config.time_zone = 'Central Time (US & Canada)'
19+
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
20+
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
21+
# config.time_zone = 'Central Time (US & Canada)'
2222

23-
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
24-
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
25-
# config.i18n.default_locale = :de
23+
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
24+
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
25+
# config.i18n.default_locale = :de
26+
# I18n.enforce_available_locales = true
2627

27-
config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
28-
end
29-
end
28+
config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
29+
end
30+
end

0 commit comments

Comments
 (0)