Merge pull request #3454 from oliverguenther/fix/bundler_version

Make bundler 1.10 optional groups optional

Gemfile

@@ -181,9 +181,19 @@ group :ldap do
   gem "net-ldap", '~> 0.8.0'
 end
 
+
+
+# Optional groups are only available with Bundler 1.10+
+# We still want older bundlers to parse this gemfile correctly,
+# thus this rather ugly workaround is needed for now.
+# TODO: Remove this when 1.10+ is widespread.
+if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.10.0')
   group :syck, optional: true do
     gem "syck", require: false
   end
+else
+  gem "syck", require: false
+end
 
 group :development do
   gem 'letter_opener', '~> 1.3.0'