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 PRERELEASE to rails-4.2
  • Loading branch information
sgonzalez-r7 committed Jul 28, 2015
1 parent e84c82e commit 674236b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gemspec

gem 'metasploit-erd',
github: 'rapid7/metasploit-erd',
branch: 'staging/rails-4.1'
branch: 'staging/rails-4.2'

group :development, :test do
# markdown formatting for yard
Expand All @@ -18,7 +18,7 @@ group :development, :test do
end

group :test do
rails_version_constraint = ['~> 4.1.0']
rails_version_constraint = ['~> 4.2.0']
# blank?
gem 'activesupport', *rails_version_constraint
# Upload coverage reports to coveralls.io
Expand Down
2 changes: 1 addition & 1 deletion lib/yard/metasploit/erd/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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'

# The full version string, including the {YARD::Metasploit::ERD::Version::MAJOR},
# {YARD::Metasploit::ERD::Version::MINOR}, {YARD::Metasploit::ERD::Version::PATCH}, and optionally, the
Expand Down

0 comments on commit 674236b

Please sign in to comment.