Commit Graph

1332 Commits

Author SHA1 Message Date
Joseph Mastey 4587a5ff67 more fixes for tests post-merge 2017-12-12 15:25:37 -06:00
Joseph Mastey 6969322920 feat(tests): fix tests for change in user_id format 2017-12-12 15:22:39 -06:00
Joseph Mastey 281a90fa1f removes user_id column from User model to use idiomatic Rails automatic IDs 2017-12-12 15:22:07 -06:00
Joseph Mastey 1db78973c0 use more idiomatic syntax for routes 2017-12-12 15:20:09 -06:00
Joseph Mastey b6c2259b88 removes user_id column from User model to use idiomatic Rails automatic IDs 2017-12-12 15:19:22 -06:00
Joseph Mastey c4f0b91534 use more idiomatic syntax for routes 2017-12-12 15:07:42 -06:00
Ken Johnson b0894b9956 Merge pull request #289 from jasnow/master
Upgraded 3 gems [ powder, uglifier, test-unit].
2017-12-12 10:55:48 -05:00
Al Snow 6e4ec10dcf Upgraded rubocop and rainbow gems 2017-12-12 10:48:20 -05:00
Al Snow b229b84296 Merge branch 'master' of https://github.com/OWASP/railsgoat 2017-12-11 11:40:33 -05:00
Al Snow 7680c4e90c Merge pull request #288 from jmmastey/rubocop-clean
clean rubocop run
2017-12-11 11:39:30 -05:00
Al Snow 3d3dc8820b Merge branch 'master' of https://github.com/jasnow/railsgoat into jmmastey-rubocop-clean 2017-12-11 11:32:24 -05:00
Al Snow c110ef43c3 Merged PR#288 + [powder, test-unit, uglifier] gems 2017-12-11 11:29:41 -05:00
Al Snow 83e1e2edd2 Merge branch 'master' of https://github.com/OWASP/railsgoat 2017-12-10 17:51:59 -05:00
Al Snow 2f20d4a9e7 Merge branch 'rubocop-clean' of https://github.com/jmmastey/railsgoat into jmmastey-rubocop-clean 2017-12-07 09:29:18 -05:00
Joseph Mastey 82fbc8dd37 chore(rubocop): organize the gemfile 2017-12-07 08:24:56 -06:00
Al Snow a878fd0c76 Merge branch 'rubocop-clean' of https://github.com/jmmastey/railsgoat into jmmastey-rubocop-clean 2017-12-07 09:06:56 -05:00
Joseph Mastey cd32c9a130 Merge branch 'master' of https://github.com/OWASP/railsgoat into rubocop-clean 2017-12-06 17:15:56 -06:00
Joseph Mastey 6e0a0a8312 feat(cops): clean rubocop run
1. ignoring one file because it's an intentional vuln
2. made a few small semantic changes, but verified that they're equivalent.
2017-12-06 17:14:25 -06:00
Ken Johnson 56cee33a4c Merge pull request #284 from OWASP/crack
Crack
2017-12-06 11:14:16 -05:00
Ken Johnson 3d52e63077 Merge pull request #286 from jmmastey/rubocop-github
use rubocop-github
2017-12-06 10:46:08 -05:00
Joseph Mastey 9902345291 chore(rubocop): giganto rubocop commit.
muahahahah
2017-12-05 18:46:21 -06:00
Joseph Mastey 284cd8811c feat(rubocop): use rubocop-github 2017-12-05 18:38:32 -06:00
Al Snow 31ecafebb4 Upgraded uglifier gem 2017-12-04 09:41:35 -05:00
cktricky 96591c4dba We do not need this gem 2017-12-01 11:56:16 -05:00
cktricky c248d47580 Upgraded to latest version of Crack 2017-12-01 11:50:58 -05:00
Ken Johnson bddc7803dc Merge pull request #283 from OWASP/crack
Crack is bad. Especially this version: CVE-2013-1800
2017-12-01 11:01:46 -05:00
cktricky 64c8b48340 Crack is bad. Especially this version: CVE-2013-1800 2017-12-01 10:17:52 -05:00
Ken Johnson 7860a68971 Merge pull request #282 from jasnow/master
Upgraded 39+ gems in Gemfile.lock file.
2017-12-01 10:03:36 -05:00
Al Snow f65aa69c8e Upgraded cucumber-tag_expressions gem 2017-12-01 08:43:16 -05:00
Al Snow d7f425a418 Upgraded cucumber-expressions gem 2017-11-29 08:05:54 -05:00
Al Snow 88b3ec5655 Upgraded cucumber-expressions gem 2017-11-28 15:40:55 -05:00
Al Snow d78f2e4b59 Upgraded cucumber family of gems 2017-11-28 08:31:05 -05:00
Al Snow acaf9cf292 Upgraded rack-test gem 2017-11-21 14:58:52 -05:00
Al Snow 92921b5ee9 Upgraded capybara gem 2017-11-20 14:26:00 -05:00
Al Snow e363a86e4a Upgraded rack-test and rspec-rails gems 2017-11-20 09:12:26 -05:00
Al Snow 7b5e784ee2 Upgraded rack-test gem 2017-11-19 10:18:24 -05:00
Al Snow d84deb3a7c Merge branch 'master' of https://github.com/OWASP/railsgoat 2017-11-19 10:16:37 -05:00
Ken Johnson 3b16f04edd Merge pull request #278 from jmmastey/updated-minified-js
@jmmastey LGTM 👍 

Good call on removing the stock photos that shipped with this as well as updating libs and removing cruft. Thank you as always 🙇
2017-11-16 09:47:08 -05:00
Al Snow 03588fabcd Upgraded rake gem 2017-11-15 13:57:13 -05:00
Al Snow 2a6910e1ad Upgraded sass-rails and mysql2 gems 2017-11-14 16:10:02 -05:00
Al Snow eb5f6f78d9 Rebuilt Gemfile.lock file; Resync'ed with upstream repo 2017-11-14 12:05:10 -05:00
Ken Johnson 155521f6a1 Merge pull request #280 from mccabe615/docker-cleanup
Docker update, cleanup, robucop rules addition
2017-11-14 11:19:46 -05:00
mccabe615 ba7e9a7845 fixing rubocop config to remove github references 2017-11-14 11:11:43 -05:00
mccabe615 26b24a1ca5 removing github rubocop gem and adding the config into the project directly. 2017-11-14 10:44:05 -05:00
Al Snow cd9afdf2f4 Upgraded capybara gem 2017-11-13 16:04:05 -05:00
Al Snow 278a31bf31 Merge branch 'master' of https://github.com/OWASP/railsgoat 2017-11-13 16:02:44 -05:00
mccabe615 cc53212a68 updating readme 2017-11-13 15:13:37 -05:00
mccabe615 ba018e1a5a cleaning up vagrant and various other files. fixing docker compose startup 2017-11-13 15:09:17 -05:00
Ken Johnson b97d5f3976 Fixing an error...
Incorrect credentials
2017-11-13 14:44:37 -05:00
mccabe615 b014794b37 adding rules 2017-11-12 15:10:26 -05:00