summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-30 18:05:53 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-08-30 18:05:53 -0400
commita5d5df3b2f24daf47450e28b327cb43d88accdaa (patch)
tree1e0b243335523577be8082c761a52db1cfbf65b2
parenta61ef038ea240ba1c86ba7e3b7123f14c760c5e4 (diff)
downloadgitlab-ci-a5d5df3b2f24daf47450e28b327cb43d88accdaa.tar.gz
Update Gemfile so it more closely matches CE's
-rw-r--r--Gemfile39
-rw-r--r--Gemfile.lock62
2 files changed, 57 insertions, 44 deletions
diff --git a/Gemfile b/Gemfile
index 71f7f1b..c04d472 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,33 +103,38 @@ gem "unf"
group :development do
gem 'brakeman', require: false
- gem 'rack-mini-profiler', require: false
gem 'annotate'
- gem 'quiet_assets'
gem "letter_opener"
+ gem 'quiet_assets'
+ gem 'rack-mini-profiler', require: false
end
group :development, :test do
- gem 'spring', '~> 1.3.6'
- gem "spring-commands-rspec", '~> 1.0.0'
- gem 'minitest'
- gem 'pry'
- gem 'rspec-rails', '~> 3.3.0'
- gem 'capybara'
- gem 'poltergeist', '~> 1.5.1'
+ gem 'byebug', platform: :mri
+ gem 'pry-rails'
+
+ gem "database_cleaner", '~> 1.4.0'
gem 'factory_girl_rails'
- gem "ffaker"
- gem "byebug"
- gem "database_cleaner"
- gem 'shoulda-matchers'
+ gem 'rspec-rails', '~> 3.3.0'
+ gem 'rubocop', '0.28.0', require: false
+
+ gem 'capybara', '~> 2.4.0'
+ gem 'capybara-screenshot', '~> 1.0.0'
+ gem 'poltergeist', '~> 1.6.0'
+
+ gem 'spring', '~> 1.3.6'
+ gem 'spring-commands-rspec', '~> 1.0.0'
+
+ gem 'minitest'
+ gem 'ffaker', '~> 2.0.0'
- gem "simplecov", require: false
gem 'coveralls', '~> 0.8.2', require: false
- gem 'rubocop', '0.28.0', require: false
end
group :test do
- gem 'webmock'
- gem 'email_spec'
+ gem 'simplecov', require: false
+ gem 'shoulda-matchers', '~> 2.8.0', require: false
+ gem 'email_spec', '~> 1.6.0'
+ gem 'webmock', '~> 1.21.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1575c0b..f375927 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,7 +35,7 @@ GEM
tzinfo (~> 1.1)
acts-as-taggable-on (3.4.3)
activerecord (>= 3.2, < 5)
- addressable (2.3.5)
+ addressable (2.3.8)
annotate (2.6.0)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
@@ -64,12 +64,15 @@ GEM
byebug (3.2.0)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
- capybara (2.1.0)
+ capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
+ capybara-screenshot (1.0.11)
+ capybara (>= 1.0, < 3)
+ launchy
celluloid (0.15.2)
timers (~> 1.1.0)
chronic (0.10.2)
@@ -93,9 +96,9 @@ GEM
simplecov (~> 0.10.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
- crack (0.4.1)
- safe_yaml (~> 0.9.0)
- database_cleaner (1.3.0)
+ crack (0.4.2)
+ safe_yaml (~> 1.0.0)
+ database_cleaner (1.4.1)
debugger-linecache (1.2.0)
default_value_for (3.0.0.1)
activerecord (>= 3.2.0, < 5.0)
@@ -106,7 +109,7 @@ GEM
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
dotenv (0.9.0)
- email_spec (1.5.0)
+ email_spec (1.6.0)
launchy (~> 2.1)
mail (~> 2.2)
encryptor (1.3.0)
@@ -122,7 +125,7 @@ GEM
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
fastercsv (1.5.5)
- ffaker (1.22.1)
+ ffaker (2.0.0)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.25.0)
@@ -234,9 +237,9 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.2)
- launchy (2.4.2)
+ launchy (2.4.3)
addressable (~> 2.3)
- letter_opener (1.1.2)
+ letter_opener (1.4.1)
launchy (~> 2.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
@@ -272,16 +275,18 @@ GEM
parser (2.2.0.2)
ast (>= 1.1, < 3.0)
pg (0.17.0)
- poltergeist (1.5.1)
+ poltergeist (1.6.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
powerpack (0.0.9)
- pry (0.9.12.4)
- coderay (~> 1.0)
- method_source (~> 0.8)
+ pry (0.10.1)
+ coderay (~> 1.1.0)
+ method_source (~> 0.8.1)
slop (~> 3.4)
+ pry-rails (0.3.4)
+ pry (>= 0.9.10)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
rack (1.5.5)
@@ -354,7 +359,7 @@ GEM
sexp_processor (~> 4.0)
ruby_parser (3.6.4)
sexp_processor (~> 4.1)
- safe_yaml (0.9.7)
+ safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
@@ -363,7 +368,7 @@ GEM
sprockets-rails (~> 2.0)
settingslogic (2.0.9)
sexp_processor (4.5.0)
- shoulda-matchers (2.4.0)
+ shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
sidekiq (2.17.0)
celluloid (>= 0.15.2)
@@ -384,7 +389,7 @@ GEM
slim (2.0.2)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
- slop (3.4.7)
+ slop (3.6.0)
spring (1.3.6)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
@@ -428,10 +433,12 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0.1)
equalizer (~> 0.0.7)
- webmock (1.16.0)
- addressable (>= 2.2.7)
+ webmock (1.21.0)
+ addressable (>= 2.3.6)
crack (>= 0.3.2)
- websocket-driver (0.3.3)
+ websocket-driver (0.6.2)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.2)
whenever (0.8.4)
activesupport (>= 2.3.4)
chronic (>= 0.6.3)
@@ -450,15 +457,16 @@ DEPENDENCIES
bootstrap-sass (~> 3.0)
brakeman
byebug
- capybara
+ capybara (~> 2.4.0)
+ capybara-screenshot (~> 1.0.0)
coffee-rails (~> 4.0.0)
colored
coveralls (~> 0.8.2)
- database_cleaner
+ database_cleaner (~> 1.4.0)
default_value_for (~> 3.0.0)
- email_spec
+ email_spec (~> 1.6.0)
factory_girl_rails
- ffaker
+ ffaker (~> 2.0.0)
fog (~> 1.25.0)
font-awesome-rails (~> 3.2)
foreman
@@ -479,8 +487,8 @@ DEPENDENCIES
oauth2 (= 1.0.0)
paranoia (~> 2.0)
pg
- poltergeist (~> 1.5.1)
- pry
+ poltergeist (~> 1.6.0)
+ pry-rails
quiet_assets
rack-mini-profiler
rails (= 4.1.12)
@@ -490,7 +498,7 @@ DEPENDENCIES
rubocop (= 0.28.0)
sass-rails (~> 4.0.5)
settingslogic
- shoulda-matchers
+ shoulda-matchers (~> 2.8.0)
sidekiq
simplecov
sinatra
@@ -506,7 +514,7 @@ DEPENDENCIES
unf
unicorn (~> 4.8.2)
virtus (= 1.0.1)
- webmock
+ webmock (~> 1.21.0)
whenever
BUNDLED WITH