2755: fix merge conflicts (refs #2755)

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index b3ec12bbb1e51d27e432f67983ec55d576194b20..b0f85124a07b1010a940f19c9cbcc744fb8de485 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -72,3 +72,6 @@ gem 'database_cleaner'
 gem 'themes_for_rails'
 
 gem 'arvados-cli', '>= 0.1.20140328152103'
+
+# pg_power lets us use partial indexes in schema.rb in Rails 3
+gem 'pg_power'