summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-18 14:15:37 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-18 15:17:25 -0400
commit0fab35217c0b5f82da0705a38697b7fab2777f15 (patch)
tree4b105ba81e9462b40db6ac39569aa490a9711b5e
parente15af6943ad276e9d160f786b3d58a758280c942 (diff)
downloadgitlab-ce-0fab35217c0b5f82da0705a38697b7fab2777f15.tar.gz
Add jasmine-rails gem
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock6
2 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 5c86ad15e40..c429777777b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -252,6 +252,7 @@ group :development, :test do
gem 'poltergeist', '~> 1.5.1'
gem 'jasmine', '~> 2.2.0'
+ gem 'jasmine-rails'
gem "spring", '~> 1.3.1'
gem "spring-commands-rspec", '1.0.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index ab424c3777c..043fcbbdfcd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,6 +298,11 @@ GEM
rack (>= 1.2.1)
rake
jasmine-core (2.2.0)
+ jasmine-rails (0.10.8)
+ jasmine-core (>= 1.3, < 3.0)
+ phantomjs (>= 1.9)
+ railties (>= 3.2.0)
+ sprockets-rails
jquery-atwho-rails (0.3.3)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
@@ -718,6 +723,7 @@ DEPENDENCIES
html-pipeline-gitlab (~> 0.1)
httparty
jasmine (~> 2.2.0)
+ jasmine-rails
jquery-atwho-rails (~> 0.3.3)
jquery-rails
jquery-scrollto-rails