424 Commits

Author	SHA1	Message	Date
Jenkins	b6a83f734d	Bump version of framework to 4.12.1	2016-05-13 12:39:43 -07:00
David Maloney	31050a8da7	Rails upgrade to 4.2.6 ... lands all of the rails 4.2 upgrade work Merge branch 'staging/rails-upgrade'	2016-05-13 14:34:50 -05:00
Jenkins	6c11054d5a	Bump version of framework to 4.12.0	2016-05-13 11:46:03 -07:00
David Maloney	fd543f13af	fix deps	2016-05-13 13:34:18 -05:00
David Maloney	2fb3123ef2	fix migration crazieness ... MS-1486	2016-05-11 14:05:34 -05:00
David Maloney	6142d2cef1	Merge branch 'master' into staging/rails-upgrade	2016-05-09 09:27:17 -05:00
Jenkins	805f98f599	Bump version of framework to 4.11.27	2016-05-06 11:32:46 -07:00
David Maloney	0b89277394	update deps	2016-05-06 11:49:07 -05:00
David Maloney	19af279ce9	Merge branch 'master' into staging/rails-upgrade	2016-05-05 10:46:12 -05:00
Jenkins	e7ff4665e1	Bump version of framework to 4.11.26	2016-05-04 09:44:18 -07:00
Brent Cook	94c8b51a54	bump payloads gem	2016-05-04 10:56:41 -05:00
Jenkins	7490ab1c78	Bump version of framework to 4.11.25	2016-05-03 17:09:07 -07:00
David Maloney	fb5b228984	Merge branch 'master' into staging/rails-upgrade	2016-05-02 11:33:35 -05:00
Jenkins	d4f1c78c5c	Bump version of framework to 4.11.24	2016-04-29 13:38:06 -07:00
wchen-r7	bf34ceeb76	Update gem metasploit-payloads to 1.1.8	2016-04-27 15:24:44 -05:00
Jenkins	d70dcbf4a4	Bump version of framework to 4.11.23	2016-04-22 09:34:10 -07:00
Metasploit	d5085f6f0d	Bump version of framework to 4.11.22	2016-04-16 09:09:23 -07:00
David Maloney	c52f3dcb0e	update to rails 4.2.6 ... fix lost dep unlocks and upgrade rails to 4.2.6 MS-1400	2016-04-15 11:45:43 -05:00
Metasploit	16c599866c	Bump version of framework to 4.11.21	2016-04-08 16:23:33 -07:00
William Vu	22d08fdf39	Revert #6748, premature Gemfile* changes	2016-04-06 14:52:22 -05:00
David Maloney	c3452ab982	unlock gemspec deps ... unlock version constraints on deps defined inside the gemspec MS-1330	2016-04-04 15:31:09 -05:00
David Maloney	fea142dc6e	unlock gemfile deps first ... unlock the gemfile deps MS-1330	2016-04-04 13:55:53 -05:00
David Maloney	8de58e4b80	Merge branch 'master' into staging/rails-upgrade	2016-04-04 09:30:01 -05:00
Brent Cook	627615d47b	update to payloads 1.1.6	2016-04-01 21:30:34 -05:00
OJ	6c602dae90	Bump payloads to 1.1.5	2016-03-31 14:03:59 +10:00
wchen-r7	bc48ebd43b	Use patch_finder for msu_finder	2016-03-29 23:21:01 -05:00
Brent Cook	b8d53dde4a	Merge branch 'upstream-master' into staging/rails-upgrade	2016-03-29 15:56:50 -05:00
Metasploit	b41ac10fe8	Bump version of framework to 4.11.20	2016-03-29 12:43:20 -07:00
thao doan	587f1ee7b3	Land #6708, module documentation for msfconsole	2016-03-29 11:30:55 -07:00
Metasploit	72bde63397	Bump version of framework to 4.11.19	2016-03-25 13:03:35 -07:00
Brent Cook	1fe40d9f2d	update to metasploit-payloads 1.1.4	2016-03-24 22:32:55 -05:00
wchen-r7	c3ce621d04	Fix gemfile	2016-03-24 20:43:51 -05:00
wchen-r7	57984706b8	Resolve merge conflict with Gemfile	2016-03-24 18:13:31 -05:00
Metasploit	e7b0c60e5c	Bump version of framework to 4.11.18	2016-03-23 07:55:29 -07:00
Metasploit	6e12e74e02	Bump version of framework to 4.11.17	2016-03-18 14:12:18 -07:00
Brent Cook	87074c0638	Land #6651, add android sqlite_query option, update metasploit-payloads	2016-03-15 18:27:49 -05:00
Brent Cook	a06236baa6	update to metasploit-payloads 1.1.3	2016-03-14 10:43:41 -05:00
Metasploit	e059f42094	Bump version of framework to 4.11.16	2016-03-11 14:17:28 -08:00
David Maloney	b878e762c0	pin rake version to 1.x line ... rake 11 remvoes the last_comment method which causes a error when trying to run rake jobs current guidance is to pin the version back to before the change MS-1230	2016-03-10 15:39:06 -06:00
David Maloney	1911d0cd17	missed credential	2016-03-09 15:39:06 -06:00
David Maloney	ca18996272	setup rails staging branch ... rails 4.1 baby!	2016-03-09 15:35:00 -06:00
David Maloney	88697a5d3f	Merge branch 'master' into staging/rails-upgrade	2016-03-08 15:22:04 -06:00
Metasploit	a5cdd7e17f	Bump version of framework to 4.11.15	2016-03-04 16:56:02 -08:00
Metasploit	ce675330c0	Bump version of framework to 4.11.14	2016-03-04 14:49:55 -08:00
Brent Cook	851e8b610e	Land metasploit-payloads#80, update to fix #6593	2016-03-02 13:44:02 -06:00
wchen-r7	9f147a54a1	Update Gemfile for Sawyer (because Octokit needs it)	2016-03-02 10:53:13 -06:00
wchen-r7	5f510df2ab	Resolve merge conflict with upstream's Gemfile.lock	2016-03-01 22:06:17 -06:00
David Maloney	368af93cfe	Merge branch 'master' of github.com:rapid7/metasploit-framework	2016-03-01 10:52:00 -06:00
Fernando Arias	cbcd431772	Updated Gemfile.lock	2016-02-26 15:41:39 -06:00
Fernando Arias	c4c5944b25	Merge branch 'staging/rails-upgrade' into staging/MS-888/engines-is-deprecated ... Conflicts: Gemfile.lock metasploit-framework.gemspec	2016-02-26 15:35:34 -06:00