Skip to content

Commit

Permalink
Create Rails 4.2 staging branch
Browse files Browse the repository at this point in the history
MSP-12847

* use Rails 4.2
* set PRERELASE to rails-4.2
* use github staging/rails-4.2 for metapsloit gems
  • Loading branch information
sgonzalez-r7 committed Jul 28, 2015
1 parent 368309d commit dc390b2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -11,13 +11,13 @@ group :development, :test do
# auto-load factories from spec/factories
gem 'factory_girl_rails'
# Point to staging/rails-4.1 on github
gem 'metasploit-yard', github: 'rapid7/metasploit-yard', branch: 'staging/rails-4.1'
gem 'metasploit-yard', github: 'rapid7/metasploit-yard', branch: 'staging/rails-4.2'
end

group :test do
# rails is not used because activerecord should not be included, but rails would normally coordinate the versions
# between its dependencies, which is now handled by this constraint.
rails_version_constraint = ['~> 4.1.0']
rails_version_constraint = ['~> 4.2.0']

# Dummy app uses actionpack for ActionController, but not rails since it doesn't use activerecord.
gem 'actionpack', *rails_version_constraint
Expand Down
2 changes: 1 addition & 1 deletion lib/metasploit/model/version.rb
Expand Up @@ -13,7 +13,7 @@ module Version
# The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
PATCH = 0
# The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version numbers.
PRERELEASE = 'rails-4.1'
PRERELEASE = 'rails-4.2'
#
# Module Methods
#
Expand Down
2 changes: 1 addition & 1 deletion metasploit-model.gemspec
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'yard', '< 0.8.7.4'

# Dependency loading
rails_version_constraints = ['~> 4.1.0']
rails_version_constraints = ['~> 4.2.0']

spec.add_runtime_dependency 'activemodel', *rails_version_constraints
spec.add_runtime_dependency 'activesupport', *rails_version_constraints
Expand Down

0 comments on commit dc390b2

Please sign in to comment.