Changeset [1edcdf13773993f89206dfd860e32f952f2d03ed] by Shawn Balestracci
Revision 1edcdf13773993f89206dfd860e32f952f2d03ed,
committed by Shawn Balestracci
· December 22nd, 2011 @ 05:07 PM
Merge branch 'travis-ci' into wip
https://github.com/vegantech/sims/commit/1edcdf13773993f89206dfd860...
127 changed files
-
A
.travis.yml -
A
config/initializers/backport_2_3_14_changes.rb -
A
spec/support/mock_helper.rb -
A
spec/support/shared_contexts.rb -
A
vendor/plugins/cells/CHANGES -
A
vendor/plugins/cells/README -
A
vendor/plugins/cells/README.rdoc -
A
vendor/plugins/cells/Rakefile -
A
vendor/plugins/cells/VERSION -
A
vendor/plugins/cells/about.yml -
A
vendor/plugins/cells/generators/cell/USAGE -
A
vendor/plugins/cells/generators/cell/cell_generator.rb -
A
vendor/plugins/cells/generators/cell/templates/cell.rb -
A
vendor/plugins/cells/generators/cell/templates/view.html.erb -
A
vendor/plugins/cells/init.rb -
A
vendor/plugins/cells/lib/cell/base.rb -
A
vendor/plugins/cells/lib/cell/caching.rb -
A
vendor/plugins/cells/lib/cell/view.rb -
A
vendor/plugins/cells/lib/rails_extensions.rb -
A
vendor/plugins/cells/test/caching_test.rb -
A
vendor/plugins/cells/test/cells/cells_test_one/renamed_instance_view.html.erb -
A
vendor/plugins/cells/test/cells/cells_test_one/super_state.html.erb -
A
vendor/plugins/cells/test/cells/cells_test_one_cell.rb -
A
vendor/plugins/cells/test/cells/cells_test_two_cell.rb -
A
vendor/plugins/cells/test/cells/helper_using/state_using_application_helper.html.erb -
A
vendor/plugins/cells/test/cells/helper_using/state_with_automatic_helper_invocation.html.erb -
A
vendor/plugins/cells/test/cells/helper_using/state_with_helper_invocation.html.erb -
A
vendor/plugins/cells/test/cells/helper_using/state_with_helper_method_invocation.html.erb -
A
vendor/plugins/cells/test/cells/my_child/hello.html.erb -
A
vendor/plugins/cells/test/cells/my_mother/bye.html.erb -
A
vendor/plugins/cells/test/cells/my_mother/hello.html.erb -
A
vendor/plugins/cells/test/cells/my_test/_broken_partial.html.erb -
A
vendor/plugins/cells/test/cells/my_test/_partial.html.erb -
A
vendor/plugins/cells/test/cells/my_test/state_with_link_to.html.erb -
A
vendor/plugins/cells/test/cells/my_test/state_with_not_included_helper_method.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_containing_broken_partial.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_containing_nonexistant_partial.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_containing_partial.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_containing_partial_without_cell_name.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_in_local_test_views_dir.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_with_explicit_english_translation.en.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_with_explicit_english_translation.html.erb -
A
vendor/plugins/cells/test/cells/my_test/view_with_instance_var.html.erb -
A
vendor/plugins/cells/test/cells/really_module/nested/happy_state.html.erb -
A
vendor/plugins/cells/test/cells/really_module/nested_cell.rb -
A
vendor/plugins/cells/test/cells/simple/two_templates_state.html.mytpl -
A
vendor/plugins/cells/test/cells/simple_cell.rb -
A
vendor/plugins/cells/test/cells/test_cell.rb -
A
vendor/plugins/cells/test/cells/two_helpers_including/state_using_another_helper.html.erb -
A
vendor/plugins/cells/test/cells_test.rb -
A
vendor/plugins/cells/test/helper_test.rb -
A
vendor/plugins/cells/test/helpers/helper_using_cell_helper.rb -
A
vendor/plugins/cells/test/testing_helper.rb -
A
vendor/plugins/coveralls/MIT-LICENSE -
A
vendor/plugins/coveralls/README -
A
vendor/plugins/coveralls/Rakefile -
A
vendor/plugins/coveralls/VERSION -
A
vendor/plugins/coveralls/init.rb -
A
vendor/plugins/coveralls/install.rb -
A
vendor/plugins/coveralls/lib/coveralls.rb -
A
vendor/plugins/coveralls/tasks/coveralls_tasks.rake -
A
vendor/plugins/coveralls/test/coveralls_test.rb -
A
vendor/plugins/coveralls/uninstall.rb -
A
vendor/plugins/moonshine/generators/moonshine_plugin/templates/LICENSE -
A
vendor/plugins/moonshine/generators/moonshine_plugin/templates/README.markdown -
A
vendor/plugins/moonshine/lib/generators/moonshine_helper.rb -
A
vendor/plugins/moonshine/lib/moonshine/tasks.rb -
A
vendor/plugins/moonshine/spec/moonshine/manifest/passenger_spec.rb -
R
script/cucumber -
R
spec/mock_helper.rb -
R
vendor/plugins/cells -
R
vendor/plugins/coveralls -
R
vendor/plugins/moonshine/generators/moonshine_plugin/templates/README.rdoc -
R
vendor/plugins/rspec -
R
vendor/plugins/rspec-rails -
R
vendor/rails -
M
.gitmodules -
M
Rakefile -
M
app/models/role.rb -
M
app/models/staff_assignment.rb -
M
app/views/district/users/_staff_assignment.erb -
M
app/views/intervention_builder/probes/_remove_benchmark.html.erb -
M
app/views/interventions/probe_assignments/_remove_benchmark.html.erb -
M
config/boot.rb -
M
config/environment.rb -
M
config/environments/cucumber.rb -
M
config/environments/test.rb -
M
config/gems.yml -
M
config/moonshine.yml -
M
features/regular_user/intervention_participants.feature -
M
features/support/env.rb -
M
lib/tasks/rcov_rake_helper.rb -
M
lib/tasks/rspec.rake -
M
lib/tasks/verify_rcov.rake -
M
spec/models/user_spec.rb -
M
spec/rcov.opts -
M
spec/spec_helper.rb -
M
vendor/plugins/moonshine/Readme.rdoc -
M
vendor/plugins/moonshine/generators/moonshine/moonshine_generator.rb -
M
vendor/plugins/moonshine/generators/moonshine/templates/staging-environment.rb -
M
vendor/plugins/moonshine/generators/moonshine_plugin/moonshine_plugin_generator.rb -
M
vendor/plugins/moonshine/generators/moonshine_plugin/templates/init.rb -
M
vendor/plugins/moonshine/generators/moonshine_plugin/templates/plugin.rb -
M
vendor/plugins/moonshine/generators/moonshine_plugin/templates/spec.rb -
M
vendor/plugins/moonshine/generators/moonshine_plugin/templates/spec_helper.rb -
M
vendor/plugins/moonshine/init.rb -
M
vendor/plugins/moonshine/lib/generators/moonshine/moonshine_generator.rb -
M
vendor/plugins/moonshine/lib/generators/moonshine/plugin/plugin_generator.rb -
M
vendor/plugins/moonshine/lib/moonshine/capistrano_integration.rb -
M
vendor/plugins/moonshine/lib/moonshine/core_ext.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/mysql.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/os.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/passenger.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/postgresql.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/rails.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/templates/moonshine.cnf.erb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/templates/passenger.vhost.erb -
M
vendor/plugins/moonshine/lib/moonshine_setup_manifest.rb -
M
vendor/plugins/moonshine/lib/tasks/gems.rake -
M
vendor/plugins/moonshine/lib/tasks/moonshine.rake -
M
vendor/plugins/moonshine/spec/moonshine/capistrano_integration_spec.rb -
M
vendor/plugins/moonshine/spec/moonshine/manifest/mysql_spec.rb -
M
vendor/plugins/moonshine/spec/moonshine/manifest/os_spec.rb -
M
vendor/plugins/moonshine/spec/moonshine/manifest/rails_spec.rb -
M
vendor/plugins/moonshine/spec/moonshine_plugin_generator_spec.rb