Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RELEASING.md to 1.0.0+ semantic versioning rules. #41

Closed
wants to merge 26 commits into from

Conversation

limhoff-r7
Copy link
Contributor

MSP-12648

Pre-verification Steps

Verification Steps

Post-merge Steps

Perform these steps prior to pushing to master or the build will be broke on master.

Version

  • Edit lib/yard/metasploit/erd/version.rb
  • Change PRERELEASE back to 'staging/rails-4.0'

darkbushido and others added 26 commits August 22, 2014 15:26
…s-4.0-autoload

MSP-11385

Conflicts:
	lib/metasploit/model.rb
	lib/metasploit/model/version.rb
	metasploit-model.gemspec
Conflicts:
	lib/metasploit/model/version.rb
	metasploit-model.gemspec
…s-4.0

Conflicts:
	lib/metasploit/model/version.rb
	metasploit-model.gemspec
Conflicts:
	lib/metasploit/model/version.rb
Conflicts:
	lib/metasploit/model/version.rb
Conflicts:
	lib/metasploit/model/version.rb
Conflicts:
	lib/metasploit/model/author.rb
	lib/metasploit/model/authority.rb
	lib/metasploit/model/email_address.rb
	lib/metasploit/model/module/action.rb
	lib/metasploit/model/module/ancestor.rb
	lib/metasploit/model/module/path.rb
	lib/metasploit/model/module/rank.rb
	lib/metasploit/model/module/target.rb
	lib/metasploit/model/platform.rb
	lib/metasploit/model/reference.rb
	lib/metasploit/model/version.rb
	spec/support/shared/examples/metasploit/model/author.rb
	spec/support/shared/examples/metasploit/model/authority.rb
	spec/support/shared/examples/metasploit/model/email_address.rb
	spec/support/shared/examples/metasploit/model/module/action.rb
	spec/support/shared/examples/metasploit/model/module/ancestor.rb
	spec/support/shared/examples/metasploit/model/module/path.rb
	spec/support/shared/examples/metasploit/model/module/rank.rb
	spec/support/shared/examples/metasploit/model/module/target.rb
	spec/support/shared/examples/metasploit/model/platform.rb
	spec/support/shared/examples/metasploit/model/reference.rb
Conflicts:
	metasploit-model.gemspec
This reverts commit c64434a.

Conflicts:
	lib/metasploit/model/author.rb
	lib/metasploit/model/authority.rb
	lib/metasploit/model/email_address.rb
	lib/metasploit/model/module/action.rb
	lib/metasploit/model/module/ancestor.rb
	lib/metasploit/model/module/path.rb
	lib/metasploit/model/module/rank.rb
	lib/metasploit/model/module/target.rb
	lib/metasploit/model/platform.rb
	lib/metasploit/model/reference.rb
Conflicts:
	lib/metasploit/model/version.rb
Land #36 - Revert "Drop mass assignment protection at the model level"
Conflicts:
	lib/metasploit/model/version.rb
…648/1-0-0-plus

MSP-12648

Conflicts:
	lib/metasploit/model/version.rb
	spec/app/models/metasploit/model/search/operator/attribute_spec.rb
	spec/lib/metasploit/model/version_spec.rb
@limhoff-r7
Copy link
Contributor Author

Opened against the wrong branch. Should have been targeted for staging/rails-4.0

@limhoff-r7 limhoff-r7 closed this May 8, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants