Download as
Browse Code »

Commit a02ded99ad2e46f68c1d24357dd7a4855fbf6056

Authored by Braulio Bhavamitra
2 parents 7d9f9816 52bb8ba3
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

Merge branch 'deploy-gemfile' into 'master' 

Load custom dependencies through Gemfile

This allows custom dependencies to be loaded through the Gemfile.

See merge request !472
Showing 1 changed file with 4 additions and 1 deletions   Show diff stats
@@ -41,9 +41,12 @@ group :cucumber do @@ -41,9 +41,12 @@ group :cucumber do
41 gem 'selenium-webdriver', '~> 2.39.0' 41 gem 'selenium-webdriver', '~> 2.39.0'
42 end 42 end
43 43
  44 +# Requires custom dependencies
  45 +eval(File.read('config/Gemfile'), binding) rescue nil
  46 +
44 # include gemfiles from enabled plugins 47 # include gemfiles from enabled plugins
45 # plugins in baseplugins/ are not included on purpose. They should not have any 48 # plugins in baseplugins/ are not included on purpose. They should not have any
46 # dependencies. 49 # dependencies.
47 Dir.glob('config/plugins/*/Gemfile').each do |gemfile| 50 Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
48 eval File.read(gemfile) 51 eval File.read(gemfile)
49 -end 52 -end
  53 +end
50 \ No newline at end of file 54 \ No newline at end of file