Merge branch 'feature/ui-components-test-architecture-bower' of github.com:opf/openproject into feature/ui-components-test-architecture-bower

pull/1035/head
Till Breuer 11 years ago
commit 46c298ff51
  1. 2
      Gemfile
  2. 4
      Gemfile.lock

@ -45,7 +45,7 @@ end
source 'https://rubygems.org'
gem "rails", "~> 3.2.17"
gem "sprockets", "2.2.2.backport1"
gem "sprockets", "2.2.2.backport2"
gem "coderay", "~> 1.0.5"
gem "rubytree", "~> 0.8.3"

@ -348,7 +348,7 @@ GEM
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.6)
sprockets (2.2.2.backport1)
sprockets (2.2.2.backport2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@ -470,7 +470,7 @@ DEPENDENCIES
shoulda
shoulda-matchers
simplecov (>= 0.8.pre)
sprockets (= 2.2.2.backport1)
sprockets (= 2.2.2.backport2)
sqlite3
strong_parameters
svg-graph

Loading…
Cancel
Save