Commit Graph

1227 Commits

Author SHA1 Message Date
Joseph Mastey d3fce41e60 change to idiomatic use of layouts versus regular views
no functional change here, but familiar Rails users will see view files in the
locations they expect. this also slightly simplifies controller code

there is one attendant change in the wiki at `rails_3/A1-SQL-Injection-Interpolation.md`
that I'm happy to make after the PR is merged.
2017-09-27 19:22:44 -05:00
Ken Johnson b7db890f51 Merge pull request #269 from jasnow/master
Upgraded to Ruby 2.4.2 plus misc gems
2017-09-25 13:46:41 -04:00
Al Snow 20635993c8 Upgraded Ruby to 2.4.2, fixed OpenSSL warnings, and 3 gems 2017-09-25 12:58:06 -04:00
Al Snow c242fb27e3 Upgraded test-unit gem 2017-09-21 07:45:21 -04:00
Al Snow 5627f5d783 Upgraded [pry, slop] gems 2017-09-20 13:51:21 -04:00
Al Snow d653743746 Merge branch 'master' of https://github.com/OWASP/railsgoat 2017-09-20 13:49:17 -04:00
Ken Johnson 87e8ebc8e5 Merge pull request #263 from jmmastey/fixing-password-vuln-makes-seeds-invalid
Fixing password vuln makes seeds invalid
2017-09-19 19:32:50 -04:00
Al Snow d101564608 Upgraded [mini_portile2, nokogiri] gems 2017-09-19 14:38:06 -04:00
Ken Johnson 59857671f1 Merge pull request #267 from cktricky/switch_build_user_info_from_controller_to_model
Relocated build_benefits_data invocation
2017-09-19 11:47:54 -04:00
cktricky 3322441ba4 whoops. Good catch @jmmastey 2017-09-19 11:38:03 -04:00
cktricky 1ead42626e I have moved the build_benefits_data invocation from the controller to the model using before_create. This has not affected behavior afaict. Tested by running rake db:drop db:setup and RAILSGOAT_MAINTAINER=yes rake (all tests passed). 2017-09-19 11:21:08 -04:00
Ken Johnson 4d17b3b2b0 Merge pull request #265 from jmmastey/fix-nil-check-in-work-info
bug(work-info): raise more useful error when key_management is missing
2017-09-19 10:57:38 -04:00
Ken Johnson 1fc41f0b8e Merge pull request #260 from jasnow/master
Thanks, Al!
2017-09-18 19:49:13 -04:00
Joseph Mastey 722a2cebe7 bug(work-info): raise more useful error when work_info.key_management is missing 2017-09-18 16:28:05 -05:00
Ken Johnson f8f3564134 Merge pull request #262 from jmmastey/fix-pto-check
bug(pto): fix issue where not having a PTO record causes the app to barf
2017-09-18 14:55:20 -04:00
Joseph Mastey b934194ffe bug(passwords): fix situations where better password rules inadvertently break tests
* use bang version of save methods in the seeds file, so that when you fix validation,
  it will at least explode, rather than silently failing to create users
* fix two tests where passwords are hardcoded so that they use stronger passwords,
  since password complexity is not the important bit of either of those tests.
2017-09-18 12:58:26 -05:00
Joseph Mastey 0bfa2f155d chore(seeds): remove useless trailing whitespace from seeds 2017-09-18 12:47:39 -05:00
Joseph Mastey 11ab30eb90 bug(pto): fix issue where not having a PTO record causes the app to barf
closes #187
2017-09-18 12:43:47 -05:00
Al Snow 3ae9aa6e2c Upgraded to bundler 1.16.0.pre.2 2017-09-18 08:59:35 -04:00
Al Snow 367800e9af Upgraded to ruby 2.3.5 2017-09-17 12:40:36 -04:00
Al Snow 01fed7d058 Upgraded simplecov gem 2017-09-11 16:12:01 -04:00
Al Snow 7a45852ba7 Upgraded rake gem 2017-09-11 08:07:47 -04:00
Al Snow e0ba502850 Upgraded Rails to 5.1.4 2017-09-08 08:54:43 -04:00
Al Snow 81fa2c9350 Upgraded multi_json gem 2017-09-07 08:58:04 -04:00
Al Snow fe52eaa389 Upgraded coderay gem 2017-09-03 13:07:55 -04:00
Al Snow af8aec6953 Upgraded sprockets-rails gem 2017-09-01 08:40:17 -04:00
Al Snow 124e151092 Unlocked down ruby-prof gem 2017-08-29 08:05:04 -04:00
Al Snow 5e533d932c Unlocked down mintest gem 2017-08-29 08:03:42 -04:00
Al Snow a440caeda1 Upgraded/Added 7+ gems 2017-08-25 08:49:19 -04:00
Al Snow 6a84888dac Upgraded Rails to 5.1.4.rc1 2017-08-24 16:31:30 -04:00
cktricky ff7b1f11a7 Fixes issue #258 2017-08-24 09:25:24 -04:00
Al Snow 991fe3255e Upgraded bundler gem 2017-08-19 19:52:06 -04:00
Al Snow 3a7fab9bf6 Upgraded power_assert gem 2017-08-19 09:03:08 -04:00
Al Snow 71c7835f55 Upgraded brakeman gem 2017-08-16 16:00:56 -04:00
Al Snow 62ee83492e Upgraded brakeman gem 2017-08-16 08:53:54 -04:00
Al Snow eec0740259 Upgraded [simplecov, simplecov-html] gems 2017-08-14 08:11:34 -04:00
Al Snow 441f5c34d4 Upgraded mini_mime gem 2017-08-12 09:00:52 -04:00
Al Snow 8520968ea8 Upgraded rspec-rails gem 2017-08-11 10:33:44 -04:00
Al Snow d45bc9fc62 Upgraded mysql2 gem 2017-08-11 06:37:02 -04:00
Al Snow 89dfffa4f6 Upgraded raindrops gem 2017-08-10 07:05:40 -04:00
Al Snow 6fdea001de Upgraded poltergeist gem 2017-08-07 15:35:29 -04:00
Al Snow 677c56c490 Upgraded capybara gem 2017-08-04 16:28:03 -04:00
Al Snow 8a567249c0 Upgraded capybara and better_errors gems 2017-08-04 07:42:03 -04:00
Al Snow 9bbdff8ed4 Upgraded Rails to 5.1.3 2017-08-03 17:25:58 -04:00
Al Snow dbd6372631 Upgraded Rails to 5.1.3.rc3 2017-08-01 08:07:35 -04:00
Al Snow 04e9f1f630 Upgraded better_errors gem 2017-07-30 07:46:13 -04:00
Al Snow eea01a05b8 Upgrade eventmachine gem 2017-07-28 09:05:59 -04:00
Al Snow 06aed414db Upgraded Rails to 5.1.3.rc2 2017-07-25 18:45:27 -04:00
Al Snow 87307d20e4 Upgraded tilt gem 2017-07-24 08:52:06 -04:00
Al Snow 618a5263f5 Upgrade bundler gem 2017-07-23 12:22:39 -04:00