nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2016-06-19 11:56:58 +02:00
commit 2cab7f02eb
No known key found for this signature in database
GPG key ID: F347E0EB47AC70D6
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Gemfile
View file

@ -234,10 +234,10 @@ end
group :development do group :development do
# Automatic test runs # Automatic test runs
gem "guard-cucumber", "2.1.2"
gem "guard-rspec", "4.7.2", require: false
gem "guard-rubocop", "1.2.0"
gem "guard", "2.14.0", require: false gem "guard", "2.14.0", require: false
gem "guard-cucumber", "2.1.2", require: false
gem "guard-rspec", "4.7.2", require: false
gem "guard-rubocop", "1.2.0", require: false
gem "rb-fsevent", "0.9.7", require: false gem "rb-fsevent", "0.9.7", require: false
gem "rb-inotify", "0.9.7", require: false gem "rb-inotify", "0.9.7", require: false
@ -261,7 +261,6 @@ group :development do
# Debugging # Debugging
gem "pry" gem "pry"
gem "pry-debundle"
gem "pry-byebug" gem "pry-byebug"
# test coverage # test coverage

3
Gemfile.lock
View file

@ -608,8 +608,6 @@ GEM
pry-byebug (3.4.0) pry-byebug (3.4.0)
byebug (~> 9.0) byebug (~> 9.0)
pry (~> 0.10) pry (~> 0.10)
pry-debundle (0.8)
pry
quiet_assets (1.1.0) quiet_assets (1.1.0)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
rack (1.6.4) rack (1.6.4)
@ -991,7 +989,6 @@ DEPENDENCIES
pronto-scss (= 0.6.0) pronto-scss (= 0.6.0)
pry pry
pry-byebug pry-byebug
pry-debundle
quiet_assets (= 1.1.0) quiet_assets (= 1.1.0)
rack-cors (= 0.4.0) rack-cors (= 0.4.0)
rack-google-analytics (= 1.2.0) rack-google-analytics (= 1.2.0)

9
Guardfile
View file

@ -22,8 +22,7 @@ guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: fals
end end
guard(:cucumber, guard(:cucumber,
command_prefix: "bin/spring", cmd: "bin/spring cucumber",
bundler: false,
all_on_start: false, all_on_start: false,
all_after_pass: false) do all_after_pass: false) do
watch(/^features\/.+\.feature$/) watch(/^features\/.+\.feature$/)
@ -37,9 +36,3 @@ guard :rubocop, all_on_start: false, keep_failed: false do
watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/) watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/)
watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/) watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/)
end end
guard :jshintrb do
watch(/^app\/assets\/javascripts\/.+\.js$/)
watch(/^lib\/assets\/javascripts\/.+\.js$/)
watch(/^spec\/javascripts\/.+\.js$/)
end