Compare commits

..

31 Commits

Author SHA1 Message Date
dependabot[bot]
2d10abcc59 Bump font-awesome-sass from 5.5.0 to 5.5.0.1
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.5.0 to 5.5.0.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08 22:27:57 +13:00
dependabot[bot]
832ec2e15e [Security] Bump rack from 1.6.10 to 1.6.11
Bumps [rack](https://github.com/rack/rack) from 1.6.10 to 1.6.11. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-07 08:33:36 +13:00
dependabot[bot]
709d188004 Bump font-awesome-sass from 5.4.1 to 5.5.0
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-06 08:53:58 +13:00
dependabot[bot]
d5dff62b48 Bump selenium-webdriver from 3.14.1 to 3.141.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.14.1 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-3.141.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-04 01:15:49 +13:00
dependabot[bot]
d290c8bf90 Merge pull request #1722 from Growstuff/dependabot/bundler/dalli-2.7.9 2018-10-31 10:01:29 +00:00
dependabot[bot]
ea286e8300 Bump dalli from 2.7.8 to 2.7.9
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.8 to 2.7.9.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.8...v2.7.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-31 09:47:09 +00:00
dependabot[bot]
3a75e69459 Merge pull request #1720 from Growstuff/dependabot/bundler/rails-assets-leaflet.markercluster-1.4.1 2018-10-31 09:43:39 +00:00
dependabot[bot]
d0ce89a9a5 Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1
Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-31 09:20:19 +00:00
dependabot[bot]
37a3e9e9e1 Bump bullet from 5.7.6 to 5.8.1
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-31 22:16:38 +13:00
dependabot[bot]
825883b323 [Security] Bump loofah from 2.2.2 to 2.2.3
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-31 09:54:56 +13:00
dependabot[bot]
77f5bcffb0 Bump rspec-rails from 3.8.0 to 3.8.1
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-25 11:59:50 +13:00
dependabot[bot]
122daca7d6 Bump capybara-screenshot from 1.0.21 to 1.0.22
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.21 to 1.0.22.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases)
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.21...v1.0.22)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-23 12:19:16 +13:00
Brenda Wallace
a635032df1 Merge branch 'master' into dev 2018-10-21 16:09:01 +13:00
dependabot[bot]
09c529a6ef Bump codeclimate-test-reporter from 1.0.8 to 1.0.9
Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases)
- [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.8...v1.0.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 08:25:19 +13:00
dependabot[bot]
014b887a1f Bump jsonapi-resources from 0.9.0 to 0.9.3
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.0 to 0.9.3.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.0...v0.9.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 08:24:57 +13:00
dependabot[bot]
10f7c864ab Bump cancancan from 2.2.0 to 2.3.0
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases)
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.2.0...2.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 08:19:33 +13:00
dependabot[bot]
c6b38105af Bump platform-api from 2.1.0 to 2.2.0
Bumps [platform-api](https://github.com/heroku/platform-api) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/heroku/platform-api/releases)
- [Commits](https://github.com/heroku/platform-api/compare/v2.1.0...v2.2.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 08:19:07 +13:00
dependabot[bot]
f02c1d80be Bump selenium-webdriver from 3.14.0 to 3.14.1
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 08:18:45 +13:00
Awesome Code
a818a2ad45 Auto corrected by following Ruby Style/UnneededCondition 2018-10-20 06:57:51 +13:00
dependabot[bot]
23525371d9 Bump rack-protection from 2.0.3 to 2.0.4
Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.3...v2.0.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:57 +13:00
dependabot[bot]
0694d37916 Bump factory_bot_rails from 4.10.0 to 4.11.1
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
dependabot[bot]
ea30f5b7b3 Bump bullet from 5.7.5 to 5.7.6
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
dependabot[bot]
0c36ea4fef Bump devise from 4.4.3 to 4.5.0
Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
dependabot[bot]
4a91bd977f Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0
Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases)
- [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
dependabot[bot]
fdf4defb46 Bump font-awesome-sass from 5.0.13 to 5.4.1
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.0.13 to 5.4.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
dependabot[bot]
cfcbd10844 Bump ruby-units from 2.3.0 to 2.3.1
Bumps [ruby-units](https://github.com/olbrich/ruby-units) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/olbrich/ruby-units/releases)
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
dependabot[bot]
22787fa994 Bump sidekiq from 5.2.1 to 5.2.2
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.1...v5.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
Ahmed Shahin
f73cc7f213 Add my name to contributors list 2018-10-20 06:56:19 +13:00
Ahmed Shahin
4b6de08181 Provide message to raise_error 2018-10-20 06:56:19 +13:00
dependabot[bot]
900d51828d Bump chartkick from 2.3.5 to 3.0.1
Bumps [chartkick](https://github.com/ankane/chartkick) from 2.3.5 to 3.0.1.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v2.3.5...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
dependabot[bot]
89b475940f Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.2.0.345 to 5.4.0.347.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-20 06:56:19 +13:00
4 changed files with 30 additions and 30 deletions

View File

@@ -72,11 +72,11 @@ GEM
sass (>= 3.3.4)
bootstrap_form (2.7.0)
builder (3.2.3)
bullet (5.7.6)
bullet (5.8.1)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
uniform_notifier (~> 1.11)
byebug (10.0.2)
cancancan (2.2.0)
cancancan (2.3.0)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
@@ -87,7 +87,7 @@ GEM
capybara-email (3.0.1)
capybara (>= 2.4, < 4.0)
mail
capybara-screenshot (1.0.21)
capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4)
launchy
chartkick (3.0.1)
@@ -95,7 +95,7 @@ GEM
ffi (~> 1.0, >= 1.0.11)
climate_control (0.2.0)
cliver (0.3.2)
codeclimate-test-reporter (1.0.8)
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
codemirror-rails (5.16.0)
railties (>= 3.0, < 6.0)
@@ -133,7 +133,7 @@ GEM
crass (1.0.4)
csv_shaper (1.3.0)
activesupport (>= 3.0.0)
dalli (2.7.8)
dalli (2.7.9)
database_cleaner (1.7.0)
debug_inspector (0.0.3)
devise (4.5.0)
@@ -176,7 +176,7 @@ GEM
figaro (1.1.1)
thor (~> 0.14)
flickraw (0.9.9)
font-awesome-sass (5.4.1)
font-awesome-sass (5.5.0.1)
sassc (>= 1.11)
formatador (0.2.5)
friendly_id (5.2.4)
@@ -226,7 +226,7 @@ GEM
rubocop (>= 0.49.0)
sysexits (~> 1.1)
hashie (3.5.7)
heroics (0.0.24)
heroics (0.0.25)
erubis (~> 2.0)
excon
moneta
@@ -261,7 +261,7 @@ GEM
railties (>= 3.2)
sprockets-rails
json (2.1.0)
jsonapi-resources (0.9.0)
jsonapi-resources (0.9.3)
activerecord (>= 4.1)
concurrent-ruby
railties (>= 4.1)
@@ -290,7 +290,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
@@ -302,10 +302,10 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
moneta (0.8.1)
moneta (1.0.0)
multi_json (1.11.3)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -351,9 +351,9 @@ GEM
parser (2.5.1.0)
ast (~> 2.4.0)
pg (0.21.0)
platform-api (2.1.0)
heroics (~> 0.0.23)
moneta (~> 0.8.1)
platform-api (2.2.0)
heroics (~> 0.0.25)
moneta (~> 1.0.0)
plupload-rails (1.2.1)
rails (>= 3.1)
poltergeist (1.17.0)
@@ -364,11 +364,11 @@ GEM
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.2)
public_suffix (3.0.3)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.10)
rack-protection (2.0.3)
rack (1.6.11)
rack-protection (2.0.4)
rack
rack-test (0.6.3)
rack (>= 1.0)
@@ -383,9 +383,9 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10)
sprockets-rails
rails-assets-leaflet (1.3.1)
rails-assets-leaflet.markercluster (1.3.0)
rails-assets-leaflet (>= 1.0.3)
rails-assets-leaflet (1.3.4)
rails-assets-leaflet.markercluster (1.4.1)
rails-assets-leaflet (>= 1.3.1)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
@@ -427,13 +427,13 @@ GEM
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.1)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.0)
rspec-rails (3.8.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -469,9 +469,9 @@ GEM
sassc (2.0.0)
ffi (~> 1.9.6)
rake
selenium-webdriver (3.14.0)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2)
sexp_processor (4.11.0)
shellany (0.0.1)
sidekiq (5.2.2)
@@ -515,7 +515,7 @@ GEM
unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.11.0)
uniform_notifier (1.12.1)
warden (1.2.7)
rack (>= 1.0)
webrat (0.7.3)
@@ -527,7 +527,7 @@ GEM
websocket-extensions (0.1.3)
will_paginate (3.1.6)
xmlrpc (0.3.0)
xpath (3.1.0)
xpath (3.2.0)
nokogiri (~> 1.8)
PLATFORMS

View File

@@ -9,6 +9,6 @@ feature 'Plantings RSS feed' do
scenario 'The index title is what we expect' do
visit plantings_path(format: 'rss')
expect(page).to have_content "Recent plantings from "\
"#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
"#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
end
end

View File

@@ -9,6 +9,6 @@ feature 'Posts RSS feed' do
scenario 'The index title is what we expect' do
visit posts_path(format: 'rss')
expect(page).to have_content "Recent posts from "\
"#{@author ? @author : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
"#{@author || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
end
end

View File

@@ -9,6 +9,6 @@ feature 'Seeds RSS feed' do
scenario 'The index title is what we expect' do
visit seeds_path(format: 'rss')
expect(page).to have_content "Recent seeds from "\
"#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
"#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
end
end