mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-07 15:47:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cf11cbd7d2 Update seeds specs 2018-10-16 15:11:46 +13:00
Brenda Wallace
ac8dff2a28 Update new post spec 2018-10-16 14:29:44 +13:00
Brenda Wallace
918f73d0f0 Update crop edit spec 2018-10-16 14:29:01 +13:00
Brenda Wallace
fb156ec438 Updating edit seeds spec 2018-10-16 14:20:15 +13:00
Brenda Wallace
92939ca204 Spec updates 2018-10-16 14:08:37 +13:00
Brenda Wallace
ec4c6f13aa Updating new seed view specs 2018-10-16 13:56:10 +13:00
Brenda Wallace
510124758d Inverse relation ships 2018-10-16 13:26:54 +13:00
Brenda Wallace
de2175ce16 More inverse relationships defined 2018-10-16 13:20:03 +13:00
Brenda Wallace
0d3588a2b2 Add another inverse_of created_alternate_names 2018-10-16 12:47:05 +13:00
Brenda Wallace
03da26f949 Upgrade nokogiri 2018-10-16 12:45:18 +13:00
Brenda Wallace
c1dabfc3d3 Typo fix, requestd_crops to requested_crops 2018-10-16 12:42:49 +13:00
Brenda Wallace
0a65e57d53 Fixed up text in spec 2018-10-16 12:42:15 +13:00
Brenda Wallace
fc0a941fb6 Adding more inverse relationships 2018-10-16 11:32:03 +13:00
Brenda Wallace
0862f34ff3 Merge branch 'dev' into upgrade/rails-5 2018-10-16 10:31:23 +13:00
Brenda Wallace
6c2afb2804 Adding missing inverswe relationship alternatename.creator 2018-10-16 10:16:45 +13:00
Brenda Wallace
bcb466dbf1 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile.lock
	spec/controllers/photos_controller_spec.rb
 2018-10-16 09:46: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
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