Changeset [9414c0c7ded0877f80c36a21f63a564f986473ca] by Shawn Balestracci
Revision 9414c0c7ded0877f80c36a21f63a564f986473ca,
committed by Shawn Balestracci
· August 20th, 2012 @ 02:45 PM
Merge branch 'master' into ruby_1.9.3
https://github.com/vegantech/sims/commit/9414c0c7ded0877f80c36a21f6...
15 changed files
-
A
app/controllers/ignore_flags_controller.rb -
A
app/views/ignore_flags/_new.html.erb -
A
app/views/ignore_flags/create.js.rjs -
A
app/views/ignore_flags/destroy.js.rjs -
A
app/views/ignore_flags/new.js.rjs -
A
spec/controllers/ignore_flags_controller_spec.rb -
R
app/views/custom_flags/ignore_flag.js.rjs -
R
app/views/custom_flags/_ignore_flag.html.erb -
R
app/views/custom_flags/unignore_flag.js.rjs -
M
app/controllers/custom_flags_controller.rb -
M
app/helpers/flags_helper.rb -
M
app/models/right.rb -
M
config/routes.rb -
M
spec/helpers/flags_helper_spec.rb -
M
spec/lib/all_controllers_spec.rb