mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brenda Wallace 7a44e9499d More markup updates to fit specs 2018-10-08 14:18:19 +13:00
Brenda Wallace aded3c00fc More spec updates 2018-10-08 14:17:28 +13:00
Brenda Wallace fe2536c864 More spec updates 2018-10-08 14:15:44 +13:00
Brenda Wallace 1e7e275684 Adding inverse relationships (except for photos) 2018-10-08 13:43:09 +13:00
Brenda Wallace 74a71be69f Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile.lock
 2018-10-08 13:33:54 +13:00
Brenda Wallace 05da2de7e4 Fix up text in checking appended date 2018-10-08 09:48:49 +13:00
Brenda Wallace fb2f5f464a Change scenario to description 2018-10-08 09:47:52 +13: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 1bb70d4bcd Ordering gems 2018-09-29 15:55:07 +12:00
Brenda Wallace cd1bf8c268 Code style fix up 2018-09-29 15:53:06 +12:00
Brenda Wallace 9694696570 Code style fix ups 2018-09-29 15:52:42 +12:00
Brenda Wallace d1d1a61be3 Added inverse to model 2018-09-29 15:52:32 +12:00
Brenda Wallace 5031b37232 Adding \n into specs, because our output has it now 2018-09-29 15:51:35 +12:00
Brenda Wallace b3ecdb0ae5 Removed include in rubocop, was making rubocop not check files 2018-09-13 23:16:16 +12:00
Brenda Wallace e2874404e4 Layout linter fix 2018-09-13 23:15:01 +12:00
Brenda Wallace 7c7d261e7e Fixed last static factorybot attribtue 2018-09-13 23:13:03 +12:00
Brenda Wallace 3ad048b7e8 Fixed linter issue, empty line after guard clause 2018-09-13 23:10:43 +12:00
Brenda Wallace ee49e8c5db Fixing unneeded condition 2018-09-13 23:09:13 +12:00
Brenda Wallace c16ee81c88 Add rubocop-rspec 2018-09-13 22:51:42 +12:00
Brenda Wallace 99a9c0817d Lint fix 2018-09-13 22:51:22 +12:00
Brenda Wallace 0359655842 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-13 22:46:20 +12:00
Brenda Wallace aad7128a31 Fixed user name generation in member factorybot 2018-09-13 22:44:46 +12:00
Brenda Wallace f52acd5282 Adding puma to gem bundle 2018-09-13 22:44:32 +12:00
Brenda Wallace ca0ad08923 Merge remote-tracking branch 'upstream/dev' into dev 2018-09-13 22:39:39 +12: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 ae48bd0564 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:08:15 +12:00
Brenda Wallace 550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12: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