diff --git a/Capfile b/Capfile index e1254503f7a..f55b742f82a 100644 --- a/Capfile +++ b/Capfile @@ -1,4 +1,4 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } Dir['lib/deploy/*.rb'].each { |r| load(r) } -load 'config/deploy' \ No newline at end of file +load 'config/deploy' diff --git a/Guardfile b/Guardfile index 2d0994b1d61..861132b5ef2 100644 --- a/Guardfile +++ b/Guardfile @@ -1,5 +1,5 @@ -# A sample Guardfile -# More info at https://github.com/guard/guard#readme +# A sample Guardfile +# More info at https://github.com/guard/guard#readme guard 'cucumber' do watch(%r{^features/.+\.feature$}) diff --git a/MIT-LICENSE b/MIT-LICENSE index 2071a36691c..416da5c6810 100644 --- a/MIT-LICENSE +++ b/MIT-LICENSE @@ -1,22 +1,22 @@ -Copyright (c) 2009, Nick Quaranto - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. +Copyright (c) 2009, Nick Quaranto + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/features/search.feature b/features/search.feature index f7697998ab6..3475ef80cd9 100644 --- a/features/search.feature +++ b/features/search.feature @@ -1,6 +1,6 @@ Feature: Search In order to find a gem I want - As a ruby developer + As a ruby developer I should be able to search for gems on gemcutter Scenario Outline: Search diff --git a/lib/deploy/passenger.rb b/lib/deploy/passenger.rb index b8c37709ac1..3ba978f5d50 100644 --- a/lib/deploy/passenger.rb +++ b/lib/deploy/passenger.rb @@ -8,4 +8,4 @@ desc "#{t} task is a no-op with mod_rails" task t, :roles => :app do ; end end -end \ No newline at end of file +end diff --git a/test/functional/api/v1/dependencies_controller_test.rb b/test/functional/api/v1/dependencies_controller_test.rb index d922ea3af4e..f00599d009c 100644 --- a/test/functional/api/v1/dependencies_controller_test.rb +++ b/test/functional/api/v1/dependencies_controller_test.rb @@ -34,7 +34,7 @@ class Api::V1::DependenciesControllerTest < ActionController::TestCase should respond_with :request_entity_too_large should "see too many gems text" do - assert page.has_content?('Too many gems to resolve') + assert page.has_content?('Too many gems to resolve') end end end