Skip to content

Commit

Permalink
Land #132, fun with pg
Browse files Browse the repository at this point in the history
  • Loading branch information
acammack-r7 committed Feb 5, 2019
2 parents 2814a4b + a79be56 commit 516c9d3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ group :development, :test do
gem 'factory_bot_rails'
# jquery-rails is used by the dummy application
gem 'jquery-rails'
# Used by the Metasploit data model, etc.
# bound to 0.20 for Activerecord 4.2.8 deprecation warnings:
# https://github.com/ged/ruby-pg/commit/c90ac644e861857ae75638eb6954b1cb49617090
gem 'pg', '0.20.0'
# add matchers from shoulda, such as validates_presence_of, which are useful for testing validations, and have_db_*
# for testing database columns and indicies.
gem 'shoulda-matchers'
Expand Down
13 changes: 7 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PATH
remote: .
specs:
metasploit-credential (3.0.2)
metasploit-credential (3.0.3)
metasploit-concern
metasploit-model
metasploit_data_models (>= 3.0.0)
net-ssh
pg (~> 0.15)
pg
railties
rex-socket
rubyntlm
Expand Down Expand Up @@ -93,20 +93,20 @@ GEM
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
railties (~> 4.2.6)
metasploit_data_models (3.0.1)
metasploit_data_models (3.0.5)
activerecord (~> 4.2.6)
activesupport (~> 4.2.6)
arel-helpers
metasploit-concern
metasploit-model
pg (= 0.20.0)
pg
postgres_ext
railties (~> 4.2.6)
recog (~> 2.0)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
net-ssh (5.0.2)
net-ssh (5.1.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
pg (0.20.0)
Expand Down Expand Up @@ -148,7 +148,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
recog (2.1.34)
recog (2.1.45)
nokogiri
redcarpet (3.4.0)
rex-core (0.1.13)
Expand Down Expand Up @@ -207,6 +207,7 @@ DEPENDENCIES
factory_bot_rails
jquery-rails
metasploit-credential!
pg (= 0.20.0)
rails (~> 4.2.6)
rails-erd
rake
Expand Down
2 changes: 1 addition & 1 deletion metasploit-credential.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ Gem::Specification.new do |s|

s.add_runtime_dependency 'net-ssh'

s.add_runtime_dependency 'pg', '~> 0.15'
s.add_runtime_dependency 'pg'
s.platform = Gem::Platform::RUBY
end

0 comments on commit 516c9d3

Please sign in to comment.