 Matt Buck
|
912f41292a
|
Drop some unused code
|
2015-04-30 11:25:57 -05:00 |
|
|
Matt Buck
|
5e2d6c27c3
|
Merge branch 'master' into staging/rails-4.0
Conflicts:
Gemfile.lock
db/schema.rb
lib/msf/core/db_manager/session.rb
metasploit-framework-db.gemspec
|
2015-04-06 11:27:00 -05:00 |
|
|
James Lee
|
1b0e3f13c6
|
Remove unnecessary extra assignment
|
2015-03-30 13:14:36 -05:00 |
|
|
Matt Buck
|
f29a3f69e9
|
Merge branch 'master' into staging/rails-4.0
Conflicts:
Gemfile.lock
metasploit-framework-db.gemspec
|
2015-03-17 15:47:48 -05:00 |
|
|
joev
|
ca3b2220b5
|
Check to ensure Mdm is loaded to fix store_loot.
|
2015-03-05 23:27:13 -06:00 |
|
|
Matt Buck
|
d4d1dc09f3
|
Merge branch 'master' into staging/rails-4.0
Conflicts:
Gemfile.lock
db/schema.rb
metasploit-framework-db.gemspec
metasploit-framework.gemspec
|
2015-02-13 16:13:18 -06:00 |
|
|
Sonny Gonzalez
|
dc1eab377c
|
Rails 4 finder conversion: convert find_or_initialize_by_x_and_y
MSP-12153
* convert to where(conditions).first_or_initialize
|
2015-02-13 12:39:44 -06:00 |
|
|
Sonny Gonzalez
|
7c57b9fb57
|
Fix Master - Pro build
MSP-12138
* revert to previous Rails 3 syntax.
|
2015-02-11 12:02:34 -06:00 |
|
|
Christian Catalan
|
3deac54d3f
|
Convert find_or_initialize_by_X to Rails 4 compatible.
MSP-12018
|
2015-02-03 16:09:49 -06:00 |
|
|
darkbushido
|
8d664bee9a
|
normalize_host dropps scope if it exists
s
|
2014-10-28 15:34:54 -05:00 |
|
|
Luke Imhoff
|
0cfac32290
|
Extract Msf::DBManager::Host
MSP-11124
Extract methods related to `Mdm::Host`s.
|
2014-10-09 11:11:36 -05:00 |
|