Download as
Browse Code »

Commit 0f829cb75b45aa4468728918799474341e603ac3

Authored by Rafael Martins
1 parent c6f24fe8
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix for cucumber environment gems spec (wrongly merged)

Showing 1 changed file with 0 additions and 3 deletions   Show diff stats
config/environments/cucumber.rb
  Diff comments   View file @0f829cb
... ... @@ -18,8 +18,6 @@ config.action_controller.allow_forgery_protection = false
18 18 # The :test delivery method accumulates sent emails in the
19 19 # ActionMailer::Base.deliveries array.
20 20 config.action_mailer.delivery_method = :test
21   -<<<<<<< HEAD
22   -=======
23 21  
24 22 config.gem 'cucumber', :lib => false, :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
25 23 config.gem 'webrat', :lib => false, :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
... ... @@ -28,4 +26,3 @@ config.gem &#39;rspec-rails&#39;, :lib =&gt; &#39;spec/rails&#39;, :version =&gt; &#39;1.2.9&#39; unles
28 26 config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))
29 27 config.gem 'selenium-client', :lib => 'selenium/client', :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
30 28 config.gem 'database_cleaner', :lib => 'database_cleaner'
31   ->>>>>>> noosfero-bsc/solr-merge
... ...