Resolve merge conflict with Gemfile

Author: wchen-r7

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+## Steps to reproduce
+
+How'd you do it?
+
+1. ...
+2. ...
+
+This section should also tell us any relevant information about the
+environment; for example, if an exploit that used to work is failing,
+tell us the victim operating system and service versions.
+
+## Expected behavior
+
+What should happen?
+
+## Current behavior
+
+What happens instead?
+
+You might also want to check the last ~1k lines of
+`/opt/metasploit/apps/pro/engine/config/logs/framework.log` or
+`~/.msf4/logs/framework.log` for relevant stack traces
+
+
+## System stuff
+
+### Metasploit version
+
+Get this with the `version` command in msfconsole (or `git log -1 --pretty=oneline` for a source install).
+
+### I installed Metasploit with:
+- [ ] Kali package via apt
+- [ ] Omnibus installer (nightly)
+- [ ] Commercial/Community installer (from http://www.rapid7.com/products/metasploit/download.jsp)
+- [ ] Source install (please specify ruby version)
+
+### OS
+
+What OS are you running Metasploit on?
+
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+
+Tell us what this change does. If you're fixing a bug, please mention
+the github issue number.
+
+## Verification
+
+List the steps needed to make sure this thing works
+
+- [ ] Start `msfconsole`
+- [ ] `use exploit/windows/smb/ms08_067_netapi`
+- [ ] ...
+- [ ] **Verify** the thing does what it should
+- [ ] **Verify** the thing does not do what it should not
+

.mailmap

@@ -114,6 +114,7 @@ m-1-k-3 <m-1-k-3@github>               Michael Messner <[email protected]>
 Meatballs1 <Meatballs1@github>         <[email protected]>
 Meatballs1 <Meatballs1@github>         <[email protected]>
 mubix <mubix@github>                   Rob Fuller <[email protected]>
+net-ninja <[email protected]>       Steven Seeley <[email protected]>
 nevdull77 <nevdull77@github>           Patrik Karlsson <[email protected]>
 nmonkee <nmonkee@github>               nmonkee <[email protected]>
 nullbind <nullbind@github>             nullbind <[email protected]>

.travis.yml

@@ -1,11 +1,22 @@
+sudo: false
+group: stable
 bundler_args: --without coverage development pcap
 cache: bundler
+addons:
+  postgresql: '9.3'
+  apt:
+    packages:
+      - libpcap-dev
+      - graphviz
+language: ruby
+rvm:
+  - '2.1.8'
+
 env:
   - RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true
   - RAKE_TASKS=spec SPEC_OPTS="--tag content"
   - RAKE_TASKS=spec SPEC_OPTS="--tag ~content"
 
-language: ruby
 matrix:
   fast_finish: true
 before_install:
@@ -23,9 +34,6 @@ before_script:
 script:
   # fail build if db/schema.rb update is not committed
   - git diff --exit-code db/schema.rb && bundle exec rake $RAKE_TASKS
-sudo: false
-rvm:
-  - '2.1.8'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"
@@ -37,10 +45,4 @@ git:
 branches:
   except:
     - gh-pages
-    - metakitty
-
-addons:
-  postgresql: '9.3'
-  apt:
-    packages:
-      - libpcap-dev
+    - metakitty

Gemfile

@@ -20,6 +20,7 @@ group :development do
   gem 'pry'
   # module documentation
   gem 'octokit', '~> 4.0'
+  # rails-upgrade staging gems
 end
 
 group :development, :test do

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.11.13)
+    metasploit-framework (4.11.18)
       actionpack (>= 4.0.9, < 4.1.0)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
@@ -10,11 +10,11 @@ PATH
       jsobfu (~> 0.4.1)
       json
       metasm (~> 1.0.2)
-      metasploit-concern (= 1.0.0)
-      metasploit-credential (= 1.0.1)
-      metasploit-model (= 1.0.0)
-      metasploit-payloads (= 1.1.1)
-      metasploit_data_models (= 1.2.11)
+      metasploit-concern
+      metasploit-credential (= 1.1.0)
+      metasploit-model (= 1.1.0)
+      metasploit-payloads (= 1.1.3)
+      metasploit_data_models (= 1.3.0)
       msgpack
       network_interface (~> 0.0.1)
       nokogiri
@@ -65,7 +65,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     builder (3.1.4)
     capybara (2.4.4)
       mime-types (>= 1.16)
@@ -111,29 +111,29 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     metasm (1.0.2)
-    metasploit-concern (1.0.0)
+    metasploit-concern (1.1.0)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
-    metasploit-credential (1.0.1)
-      metasploit-concern (~> 1.0)
-      metasploit-model (~> 1.0)
-      metasploit_data_models (~> 1.0)
+    metasploit-credential (1.1.0)
+      metasploit-concern (~> 1.1)
+      metasploit-model (~> 1.1)
+      metasploit_data_models (~> 1.3)
       pg
       railties
       rubyntlm
       rubyzip (~> 1.1)
-    metasploit-model (1.0.0)
+    metasploit-model (1.1.0)
       activemodel (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
-    metasploit-payloads (1.1.1)
-    metasploit_data_models (1.2.11)
+    metasploit-payloads (1.1.3)
+    metasploit_data_models (1.3.0)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       arel-helpers
-      metasploit-concern (~> 1.0)
-      metasploit-model (~> 1.0)
+      metasploit-concern (~> 1.1)
+      metasploit-model (~> 1.1)
       pg
       postgres_ext
       railties (>= 4.0.9, < 4.1.0)

config/cucumber.yml

@@ -6,5 +6,6 @@ ignored_tags = "--tags ~@boot --tags ~@targets"
 %>
 default: <%= std_opts %> <%= ignored_tags %> features
 boot: <%= std_opts %> --tags @boot features
+exploit: <%= std_opts %> --tags @targets features
 wip: --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip