Commit Graph

5278 Commits

Author SHA1 Message Date
dependabot[bot]
d9e7c9a831 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>
release48
2018-10-19 17:00:03 +13:00
dependabot[bot]
0e4005897e 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-19 16:59:37 +13:00
dependabot[bot]
1c852d992e Merge pull request #1688 from Growstuff/dependabot/bundler/devise-4.5.0 2018-10-18 09:34:55 +00:00
dependabot[bot]
c9084618d0 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-18 09:08:22 +00:00
dependabot[bot]
5021061523 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-18 22:05:35 +13:00
dependabot[bot]
6e0687c2c3 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-18 15:50:56 +13:00
dependabot[bot]
2f34846c66 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-18 14:20:14 +13:00
Brenda Wallace
d594e19448 Merge branch 'master' into dev 2018-10-16 09:30:14 +13:00
dependabot[bot]
e4f130fa48 Merge pull request #1705 from Growstuff/dependabot/bundler/sidekiq-5.2.2 2018-10-15 20:10:38 +00:00
dependabot[bot]
42f05a0f3e 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-10 08:22:23 +00:00
pozorvlak
cdf9be3590 Merge pull request #1704 from codeminator/fix-warning-in-photos-controller-spec
Fix Warning in specs: PhotoController
2018-10-10 09:19:33 +01:00
pozorvlak
b5347039c0 Merge branch 'dev' into fix-warning-in-photos-controller-spec 2018-10-10 08:38:18 +01:00
pozorvlak
734f97a3eb Merge pull request #1687 from Growstuff/dependabot/bundler/chartkick-3.0.1
Bump chartkick from 2.3.5 to 3.0.1
2018-10-10 08:37:13 +01:00
pozorvlak
e5ef2df518 Merge branch 'dev' into fix-warning-in-photos-controller-spec 2018-10-10 08:34:23 +01:00
Ahmed Shahin
5dde5610eb Add my name to contributors list 2018-10-10 08:46:28 +02:00
Ahmed Shahin
ac535d32e8 Provide message to raise_error 2018-10-10 08:42:05 +02:00
dependabot[bot]
71badfbc3c 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-07 08:42:58 +00:00
Brenda Wallace
be7767619c Merge pull request #1702 from Growstuff/dependabot/bundler/newrelic_rpm-5.4.0.347
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
2018-10-07 21:40:04 +13:00
Brenda Wallace
0390428bcf Merge pull request #1701 from Growstuff/dev
Release to production
2018-10-07 21:39:27 +13:00
dependabot[bot]
d05569fc27 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-05 02:53:14 +00:00
Brenda Wallace
4690fb4364 Merge pull request #1700 from Growstuff/dependabot/bundler/nokogiri-1.8.5
[Security] Bump nokogiri from 1.8.4 to 1.8.5
2018-10-05 15:51:10 +13:00
dependabot[bot]
4bdcb782d9 [Security] Bump nokogiri from 1.8.4 to 1.8.5
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 02:37:04 +00:00
Brenda Wallace
ea67df0da3 Added dependabot to contributors again 2018-09-12 10:59:13 +12:00
dependabot[bot]
8a3fcf7939 Merge pull request #1686 from Growstuff/dependabot/bundler/sidekiq-5.2.1 2018-09-11 05:00:52 +00:00
dependabot[bot]
b69759754f Bump sidekiq from 5.1.3 to 5.2.1
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.1.3 to 5.2.1.
- [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.1.3...v5.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-11 04:12:12 +00:00
Brenda Wallace
914c981a1d Merge pull request #1690 from Growstuff/dependabot/bundler/rubyzip-1.2.2
[Security] Bump rubyzip from 1.2.1 to 1.2.2
2018-09-11 16:06:46 +12:00
Brenda Wallace
ef60f74624 Removed extra blank lines 2018-09-11 15:57:09 +12:00
Brenda Wallace
9ee0846a30 Merge remote-tracking branch 'upstream/master' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 15:56:07 +12:00
Brenda Wallace
fb4dca03d2 Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 15:51:03 +12:00
Awesome Code
d248f99209 Auto corrected by following Ruby rspec layout 2018-09-11 03:29:48 +00:00
Awesome Code
7301c6cd6c Auto corrected by following Ruby RSpec/HooksBeforeExamples 2018-09-11 03:02:54 +00:00
Brenda Wallace
a5bb24b2a8 Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 14:50:57 +12:00
Brenda Wallace
189d2b49a6 Merge pull request #1647 from Growstuff/dev
Release 47
2018-09-11 10:23:11 +12:00
Awesome Code
34470a8457 Auto corrected by following Ruby Layout/LeadingBlankLines release47 2018-09-10 22:20:20 +00:00
Awesome Code
90f4db4853 Auto corrected by following Ruby rspec layout 2018-09-10 22:20:12 +00:00
Brenda Wallace
a9d463e9be Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 08:06:59 +12:00
pozorvlak
28503cdca0 Merge pull request #1696 from Growstuff/awesomecode-ruby/factorybot/attributedefinedstatically-22693
Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically
2018-09-10 10:48:20 +01:00
Awesome Code
31744491ea Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically 2018-09-09 21:53:57 +00:00
dependabot[bot]
4ec327f705 [Security] Bump rubyzip from 1.2.1 to 1.2.2
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-09 08:35:44 +00:00
Cesy
d541f795f6 Merge pull request #1694 from Br3nda/upgrade/elasticsearch
Upgrade/elasticsearch
2018-09-09 09:33:09 +01:00
Brenda Wallace
03837e193e Test coverage 2018-09-09 14:25:40 +12:00
Brenda Wallace
612bfcffcb Adding codeclimate to env 2018-09-09 13:48:17 +12:00
Brenda Wallace
d0b785bcd3 Pass elasticsearch version from travis.yaml 2018-09-09 13:33:20 +12:00
Brenda Wallace
857c9e9d7a whitespace fixups 2018-09-09 12:44:52 +12:00
Brenda Wallace
913ac45127 Changed query syntax for elasticsearch 2018-09-09 12:40:40 +12:00
Brenda Wallace
27c4dbedf2 Elasticsearch has dropped the string type and is now using text 2018-09-09 12:18:50 +12:00
Brenda Wallace
4867c68984 Added stdout print when creating/refreshing elasticsearch index 2018-09-09 12:11:10 +12:00
Brenda Wallace
a326f92210 Move elastic search index create to same line as db:create 2018-09-09 11:59:50 +12:00
Brenda Wallace
835e277f49 whitepace fix up 2018-09-09 11:58:43 +12:00
Brenda Wallace
7197843ac3 Reindex elasticsearch rake task 2018-09-09 11:56:37 +12:00