Commit Graph

16 Commits

Author SHA1 Message Date
Robert Richter
903d9d918b Localize English model attribute names
Also add rails-i18n gem
2015-04-21 20:06:48 -05:00
Robert Richter
66fa397a75 Put 4.2 gemfile back on 4.2 2015-04-20 21:58:52 -05:00
Robert Richter
4442fff4b0 OF COURSE IT WAS WINDOWS' FAULT 2015-04-20 21:56:17 -05:00
Robert Richter
b2ded1320e Of course this is Windows' fault 2015-04-20 21:38:31 -05:00
Robert Richter
a67d973785 Freeze bcrypt and bcrypt-ruby version 2015-04-20 21:33:04 -05:00
Robert Richter
60430751a6 Fix bcrypt version? 2015-04-20 21:28:38 -05:00
Robert Richter
661dc37e22 Fix bcrypt version again, sync gemfiles 2015-04-20 21:18:21 -05:00
Robert Richter
33ecdfe97b Downgrade version of bcrypt for travis 2015-04-19 19:30:53 -05:00
Robert Richter
6640d9d085 Add bcrypt to Rails 4.2 Edge gemfile 2015-04-19 19:29:45 -05:00
Robert Richter
64b5a549a7 Add RuboCop to experimental gemfile 2015-03-29 16:59:26 -05:00
Robert Richter
9510d53b7f Copy Gemfile changes to experimental buildfile 2015-03-22 00:10:50 -05:00
Robert Richter
67f51045f5 Add experimental framework update builds
Also add bundler arguments to speed up build
2015-03-21 17:55:32 -05:00
Andrew Brown
7da462c666 Remove gemfiles lib 2015-03-16 07:40:14 +00:00
Andrew Brown
3fd6d604fe Revert "Revert "Resolve merge with master""
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
2015-03-13 22:46:31 -05:00
Robert Richter
6f8ae925ba Revert "Resolve merge with master"
This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing
changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.
2015-03-13 20:18:49 -05:00
Robert Richter
ff043557e4 Add experimental build for Ruby 2.1.0 for issue #338 2014-03-22 18:53:15 -05:00