deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'features/pry'

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-13 21:33:18 +02:00
parent 0d393d88eb 8569317367
commit 6473977a2f
3 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -11,3 +11,5 @@ public/uploads/
.rvmrc .rvmrc
.directory .directory
nohup.out nohup.out
Vagrantfile
.vagrant

4
Gemfile
View file

@ -48,9 +48,7 @@ group :development, :test do
gem "capybara" gem "capybara"
gem "autotest" gem "autotest"
gem "autotest-rails" gem "autotest-rails"
unless ENV["CI"] gem "pry"
gem "ruby-debug19", :require => "ruby-debug"
end
gem "awesome_print" gem "awesome_print"
gem "database_cleaner" gem "database_cleaner"
gem "launchy" gem "launchy"

23
Gemfile.lock
View file

@ -57,7 +57,6 @@ GEM
acts_as_list (0.1.4) acts_as_list (0.1.4)
addressable (2.2.6) addressable (2.2.6)
ansi (1.4.2) ansi (1.4.2)
archive-tar-minitar (0.5.2)
arel (3.0.0) arel (3.0.0)
autotest (4.4.6) autotest (4.4.6)
ZenTest (>= 4.4.1) ZenTest (>= 4.4.1)
@ -81,6 +80,7 @@ GEM
charlock_holmes (0.6.8) charlock_holmes (0.6.8)
childprocess (0.3.1) childprocess (0.3.1)
ffi (~> 1.0.6) ffi (~> 1.0.6)
coderay (1.0.5)
coffee-rails (3.2.1) coffee-rails (3.2.1)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (~> 3.2.0.beta) railties (~> 3.2.0.beta)
@ -88,7 +88,6 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.2.0) coffee-script-source (1.2.0)
columnize (0.3.6)
crack (0.3.1) crack (0.3.1)
daemons (1.1.8) daemons (1.1.8)
database_cleaner (0.7.1) database_cleaner (0.7.1)
@ -136,12 +135,11 @@ GEM
letter_opener (0.0.2) letter_opener (0.0.2)
launchy launchy
libv8 (3.3.10.4) libv8 (3.3.10.4)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.4.1) mail (2.4.1)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
method_source (0.7.0)
mime-types (1.17.2) mime-types (1.17.2)
multi_json (1.0.4) multi_json (1.0.4)
multi_xml (0.4.1) multi_xml (0.4.1)
@ -158,6 +156,10 @@ GEM
orm_adapter (0.0.6) orm_adapter (0.0.6)
polyglot (0.3.3) polyglot (0.3.3)
posix-spawn (0.3.6) posix-spawn (0.3.6)
pry (0.9.8.2)
coderay (~> 1.0.5)
method_source (~> 0.7)
slop (>= 2.4.4, < 3)
pygments.rb (0.2.4) pygments.rb (0.2.4)
rubypython (~> 0.5.3) rubypython (~> 0.5.3)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
@ -212,16 +214,6 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.8.0) rspec (~> 2.8.0)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
ruby-debug19 (0.11.6)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
rubyntlm (0.1.1) rubyntlm (0.1.1)
rubypython (0.5.3) rubypython (0.5.3)
blankslate (>= 2.1.2.3) blankslate (>= 2.1.2.3)
@ -254,6 +246,7 @@ GEM
rack-protection (~> 1.2) rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
six (0.2.0) six (0.2.0)
slop (2.4.4)
sprockets (2.1.2) sprockets (2.1.2)
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
@ -319,6 +312,7 @@ DEPENDENCIES
launchy launchy
letter_opener letter_opener
omniauth-ldap omniauth-ldap
pry
pygments.rb (= 0.2.4) pygments.rb (= 0.2.4)
rails (= 3.2.1) rails (= 3.2.1)
rails-footnotes rails-footnotes
@ -326,7 +320,6 @@ DEPENDENCIES
rdiscount rdiscount
resque resque
rspec-rails rspec-rails
ruby-debug19
sass-rails (= 3.2.3) sass-rails (= 3.2.3)
seed-fu seed-fu
shoulda (~> 3.0.0.beta2) shoulda (~> 3.0.0.beta2)