railties 3.1.2.rc1 → 3.1.2.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/rails/generators/app_base.rb +1 -1
  2. data/lib/rails/version.rb +1 -1
  3. metadata +9 -9
data/lib/rails/generators/app_base.rb CHANGED
@@ -209,7 +209,7 @@ module Rails
209
209
  # Gems used only for assets and not required
210
210
  # in production environments by default.
211
211
  group :assets do
212
- gem 'sass-rails', #{options.dev? || options.edge? ? " :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : " '~> 3.1.4'"}
212
+ gem 'sass-rails', #{options.dev? || options.edge? ? " :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : " '~> 3.1.5.rc.2'"}
213
213
  gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
214
214
  gem 'uglifier', '>= 1.0.3'
215
215
  end
data/lib/rails/version.rb CHANGED
@@ -3,7 +3,7 @@ module Rails
3
3
  MAJOR = 3
4
4
  MINOR = 1
5
5
  TINY = 2
6
- PRE = "rc1"
6
+ PRE = "rc2"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: railties
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424119
4
+ hash: 15424113
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 3
8
8
  - 1
9
9
  - 2
10
10
  - rc
11
- - 1
12
- version: 3.1.2.rc1
11
+ - 2
12
+ version: 3.1.2.rc2
13
13
  platform: ruby
14
14
  authors:
15
15
  - David Heinemeier Hansson
@@ -91,14 +91,14 @@ dependencies:
91
91
  requirements:
92
92
  - - "="
93
93
  - !ruby/object:Gem::Version
94
- hash: 15424119
94
+ hash: 15424113
95
95
  segments:
96
96
  - 3
97
97
  - 1
98
98
  - 2
99
99
  - rc
100
- - 1
101
- version: 3.1.2.rc1
100
+ - 2
101
+ version: 3.1.2.rc2
102
102
  requirement: *id005
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: actionpack
@@ -109,14 +109,14 @@ dependencies:
109
109
  requirements:
110
110
  - - "="
111
111
  - !ruby/object:Gem::Version
112
- hash: 15424119
112
+ hash: 15424113
113
113
  segments:
114
114
  - 3
115
115
  - 1
116
116
  - 2
117
117
  - rc
118
- - 1
119
- version: 3.1.2.rc1
118
+ - 2
119
+ version: 3.1.2.rc2
120
120
  requirement: *id006
121
121
  description: "Rails internals: application bootup, plugins, generators, and rake tasks."
122
122
  email: david@loudthinking.com