Commit Graph

4221 Commits

Author SHA1 Message Date
Robert Richter
baa0fc8c0d Remove escaped apostrophes 2015-04-20 19:22:40 -05:00
Robert Richter
860f5d48c8 Fix function that creates 10 anonymous users every call 2015-04-20 19:16:20 -05:00
Robert Richter
9f80f8a1d7 Merge branch 'implement-bcrypt' of https://github.com/Cantido/Indent into implement-bcrypt 2015-04-19 19:31:20 -05:00
Robert Richter
33ecdfe97b Downgrade version of bcrypt for travis 2015-04-19 19:30:53 -05:00
Robert Richter
b28c9d6bc3 They ought to be more specific about the bcrypt gem 2015-04-19 19:30:51 -05:00
Robert Richter
6640d9d085 Add bcrypt to Rails 4.2 Edge gemfile 2015-04-19 19:29:45 -05:00
Robert Richter
07fe224cb8 Spell things correctly 2015-04-19 19:29:44 -05:00
Robert Richter
367b4ed36b Filter sensitive data from logs 2015-04-19 19:29:43 -05:00
Robert Richter
3df0ff50e1 Migrate to built-in ActiveModel secure passwords 2015-04-19 19:29:42 -05:00
Robert Richter
f71f7c5135 bundle update 2015-04-19 19:27:14 -05:00
Robert Richter
9683f67ad0 Change regex to use %r{}, as per RuboCop 2015-04-19 19:26:28 -05:00
Robert Richter
7816d07d54 Freeze version of rmagic gem
This is the only one I can use on Windows, and updating is a huge hassle
2015-04-19 19:24:49 -05:00
Robert Richter
fc62f30770 Downgrade version of bcrypt for travis 2015-04-19 15:54:09 -05:00
Robert Richter
a76d485e0c They ought to be more specific about the bcrypt gem 2015-04-19 15:47:54 -05:00
Robert Richter
55e56fad1c Merge branch 'implement-bcrypt' of https://github.com/drusepth/Indent into implement-bcrypt 2015-04-19 15:34:50 -05:00
Robert Richter
328e76659a Add bcrypt to Rails 4.2 Edge gemfile 2015-04-19 15:34:14 -05:00
Robert Richter
ac9f494234 Spell things correctly 2015-04-19 15:34:13 -05:00
Robert Richter
e3f78701c8 Filter sensitive data from logs 2015-04-19 15:34:12 -05:00
Robert Richter
a7eb5c62bc Migrate to built-in ActiveModel secure passwords 2015-04-19 15:34:11 -05:00
Robert Richter
a2390a1c47 Add missing variable to seeds files 2015-04-19 15:33:14 -05:00
Robert Richter
676feb3c6f Add bcrypt to Rails 4.2 Edge gemfile 2015-04-19 14:23:39 -05:00
Robert Richter
34b5d56cda Spell things correctly 2015-04-19 14:11:24 -05:00
Robert Richter
39d7d05698 Filter sensitive data from logs 2015-04-19 14:07:18 -05:00
Robert Richter
695cdc4f05 Migrate to built-in ActiveModel secure passwords 2015-04-19 13:43:44 -05:00
Robert Richter
a1c3ed6501 Add RuboCop scan to default Rake task 2015-04-19 13:43:30 -05:00
Robert Richter
0a8edfd2c7 Merge branch 'master' of https://github.com/drusepth/Indent 2015-04-18 23:46:36 -05:00
Andrew Brown
abd14e91c5 Merge pull request #423 from drusepth/clean-style
Clean style
2015-04-18 23:40:55 -05:00
Robert Richter
6d05bc769e Fix a string containing escape characters 2015-04-18 22:57:11 -05:00
Robert Richter
44efdd2677 Prepare for Yard doc generation 2015-04-01 17:25:01 -05:00
Robert Richter
7ef5290a1b Make controller test helper more verbose 2015-04-01 17:12:07 -05:00
Robert Richter
8be9764b38 Write equipment generator test 2015-04-01 17:11:13 -05:00
Robert Richter
0c06725c04 Add greater-than-zero constraint 2015-04-01 16:59:42 -05:00
Robert Richter
cbe0dbda1d Create tests for the locations generator 2015-04-01 16:57:58 -05:00
Robert Richter
38857c6936 Extract assert_assigns method to test_helper 2015-04-01 16:43:10 -05:00
Robert Richter
7022687e65 Test characters generator controller 2015-04-01 00:31:35 -05:00
Robert Richter
6cc3c79c49 Merge branch 'master' into clean-style 2015-03-31 23:57:29 -05:00
Robert Richter
99fd833cd8 Add a test to cover automatic anon account creation 2015-03-31 23:56:53 -05:00
Robert Richter
ba3bbd0a99 Test User controller update 2015-03-31 23:07:39 -05:00
Robert Richter
796db74c5f Merge branch 'master' into clean-style
Conflicts:
	test/controllers/users_controller_test.rb
2015-03-29 21:34:32 -05:00
Robert Richter
7f3e7a68cb Test UsersController 2015-03-29 21:18:17 -05:00
Robert Richter
1c87087861 Add missing equals sign 2015-03-29 20:17:34 -05:00
Robert Richter
d4eb1adc07 Merge branch 'master' into clean-style
Conflicts:
	test/controllers/magic_controller_test.rb
2015-03-29 19:25:32 -05:00
Robert Richter
9aaa44d137 Test MagicController 2015-03-29 19:14:03 -05:00
Robert Richter
093eaac7a6 Test UniversesController 2015-03-29 18:20:43 -05:00
Robert Richter
971a0061d2 Ignore vendor files for the experimental gemfiles 2015-03-29 17:11:48 -05:00
Robert Richter
64b5a549a7 Add RuboCop to experimental gemfile 2015-03-29 16:59:26 -05:00
Robert Richter
934735c793 Tell RuboCop to ignore vendor code 2015-03-29 16:56:38 -05:00
Robert Richter
8266acdd56 I did translation parameters wrong 2015-03-29 16:52:08 -05:00
Robert Richter
3be8dc9a78 Clean style of config files 2015-03-29 16:38:44 -05:00
Robert Richter
c34849f3b9 Clean style of English l10n files 2015-03-29 16:38:28 -05:00