Commit Graph

1898 Commits

Author SHA1 Message Date
Al Snow 46128211e1 Merge branch 'master' of https://github.com/OWASP/railsgoat 2013-11-08 08:28:50 -05:00
Ken Johnson 9f34e4fa37 Merge pull request #63 from GSMcNamara/master
Minor typo fixes.
2013-11-07 12:27:21 -08:00
GSMcNamara 09c0f07d8b Lowercased a letter. 2013-11-07 15:06:05 -05:00
GSMcNamara 7ddec28bcc Removed apostrophe 2013-11-07 15:02:31 -05:00
GSMcNamara 813711d79e Grammar fix. 2013-11-07 14:56:18 -05:00
Al Snow 98ccf0bd41 Rebuilt Gemfile.lock file; Changed "@@" (class var) to "$" (global var) in spec/support/capybara_shared.rb 2013-10-28 19:45:42 -04:00
Al Snow 94d4410528 1. Changed 1.9.3 to 2.0.0 in .rvmrc, .travis.yml, Gemfile, README.md.
2. Rebuilt Gemfile.lock file.
3. Changed "@@" (class var) to "$" (global var) in spec/support/capybara_shared.rb
2013-10-28 19:32:59 -04:00
Al Snow 842e09d3d4 Merge branch 'master' of https://github.com/OWASP/railsgoat 2013-10-28 09:35:51 -04:00
cktricky acf3b533bd fixing travis ci build icon 2013-10-27 22:43:10 -04:00
cktricky 1e93dc3d4d appears to have solved the issue with our code printing stderrs 2013-10-27 22:38:52 -04:00
cktricky 86035a1cbd appears to have solved the issue with our code printing stderrs 2013-10-27 22:38:38 -04:00
Al Snow 9d6c567af1 Rebuilt Gemfile.lock file 2013-10-27 21:49:17 -04:00
cktricky 11480ac853 tests are working again, I will work on surpressing the errors. Also merged @jasnow work 2013-10-27 21:46:12 -04:00
Al Snow f828fd6d5c Merge branch 'master' of https://github.com/OWASP/railsgoat 2013-10-27 20:37:29 -04:00
cktricky 4d2c421863 removing unwanted files 2013-10-27 20:20:51 -04:00
cktricky 6d1c0c7869 merging 2013-10-27 20:17:52 -04:00
Mike McCabe b8c400b29d commenting out this test until I can get it to go into failure not pending 2013-10-23 18:28:24 -04:00
Mike McCabe 01458fb0f5 this reduces the error but we still need to rescue the file not found error. for another day. 2013-10-23 18:28:24 -04:00
cktricky 7c1d52320a does not fix the error that occurs (as it should, but that we want to obfuscate) when a command is injected into, however, it does pass the build and does not break the entire call 2013-10-23 17:11:28 -05:00
Al Snow 203a7a244f Added simplecov gem code changes 2013-10-23 10:29:20 -04:00
Al Snow 8fd7975b6c Added blank line to Gemfile to match parent repo 2013-10-23 10:03:06 -04:00
Al Snow 10373b3294 Undid stuff for cov and 2.0.0; 1 failed spec 2013-10-23 10:01:14 -04:00
Al Snow ad0cf1d204 After forced git pull to sync with parent repo 2013-10-23 09:36:06 -04:00
Mike McCabe a921f2118d minor fix 2013-10-22 17:08:27 -04:00
Mike McCabe 6fa175ac61 a little fix for the error running the command injection spec. basically capturing the error from cp and sending it to the gutter 2013-10-22 11:31:47 -04:00
cktricky c6e42901c7 fixing a mistake 2013-10-22 10:38:23 -04:00
cktricky 1817251af5 changes 2013-10-22 10:38:00 -04:00
Al Snow bd066068ff Upgraded Rails from 3.2.13 to 3.2.15. Removed unneeded "~>" gem numbers in Gemfile. 2013-10-22 10:29:57 -04:00
Mike McCabe 3820b78066 fixing this function that was not explicitly using the params 2013-10-22 10:16:09 -04:00
Al Snow 22fb3dde46 Merge branch 'master' of https://github.com/OWASP/railsgoat 2013-10-22 08:36:48 -04:00
cktricky b7c3b04c74 this seems to have fixed a nuisance error within our unit-tests. Issue #57 2013-10-22 00:58:48 -04:00
cktricky 753840a276 this seems to have fixed a nuisance error within our unit-tests. Issue #57 2013-10-22 00:57:32 -04:00
Al Snow f8ab8c320c Upgraded Ruby to 2.0.0. 2013-10-20 11:59:23 -04:00
Al Snow 45cac913ff Upgraded Rails from 3.2.13 to 3.2.15. Removed unneeded "~>" gem numbers in Gemfile. 2013-10-20 10:42:30 -04:00
cktricky 64f2ad9f9e very minor sidebar change 2013-10-14 08:46:21 -04:00
cktricky f9bbbe0a54 oops 2013-10-14 08:44:09 -04:00
cktricky 6897996394 merged 2013-10-14 08:42:27 -04:00
cktricky 940181f397 merged some content 2013-10-14 08:39:20 -04:00
cktricky d2bc7d740a minor fix 2013-10-14 08:36:52 -04:00
cktricky a65a20a647 Merge branch 'master' of github.com:OWASP/railsgoat into top-10-2013 2013-10-14 08:29:39 -04:00
cktricky f02895351d removed a bit of cruft, also activated the sidebar item when working within the messages section 2013-10-13 23:17:18 -04:00
Ken Johnson e4ee11cbdc Merge pull request #56 from mccabe615/master
Adding messaging system
2013-10-13 20:08:28 -07:00
cktricky 7a101a9bb5 fix for issue #44 2013-10-13 21:50:25 -04:00
cktricky 16bd465633 this appears to fix the problem with our accordion not working correctly. I couldnt find a reason to use bootstrap.js anyways. 2013-10-13 21:50:25 -04:00
Mike McCabe 8c17a3df0e adding messaging function, needs tests... 2013-10-13 21:49:17 -04:00
cktricky afbd8d53b6 fix for issue #44 2013-10-12 17:04:57 -04:00
cktricky a67b3546b1 this appears to fix the problem with our accordion not working correctly. I couldnt find a reason to use bootstrap.js anyways. 2013-10-12 16:14:10 -04:00
Mike McCabe b0a5248c05 adding read data to seeds 2013-10-12 13:38:47 -04:00
Mike McCabe 8686f6b9d3 adding messages mvc to allow users to send messages. 2013-10-11 16:03:37 -04:00
Mike McCabe dbd0c2548d making full_name method public 2013-10-11 16:03:37 -04:00