Download as
Browse Code »

Commit a02ded99ad2e46f68c1d24357dd7a4855fbf6056

Authored by Braulio Bhavamitra
2 parents 7d9f9816 52bb8ba3
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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