mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 50945c6f75 Files should end with a trailing newline 2019-07-03 08:41:23 +12:00
Brenda Wallace c791b21c47 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-03 08:41:01 +12:00
Brenda Wallace 8c02ea943a Tidy up photo display (line up) 2019-07-03 08:25:23 +12:00
Brenda Wallace b90f6d5ff6 Tidy up facts on plantings#show 2019-07-03 08:20:58 +12:00
Brenda Wallace 036fea1c03 Fix scss compile error, by using our own variable 2019-07-03 08:16:46 +12:00
Brenda Wallace 13450f64ed Squish a devise deprecation warning 2019-07-02 09:41:40 +00:00
Brenda Wallace ad888575a5 Upgrade boostrap gem 2019-07-02 16:55:15 +12:00
Brenda Wallace 5ad298e43a TYPO! 2019-07-02 04:52:39 +00:00
Brenda Wallace 67239ec8b1 rubocop fixup 2019-07-02 04:52:39 +00:00
Brenda Wallace fda4d88e5a Fix up locale spec 2019-07-02 04:52:39 +00:00
Brenda Wallace b56771f9b7 specs for comments on profile pages 2019-07-02 04:52:39 +00:00
Brenda Wallace 4f59ef2e43 more profile page specs 2019-07-02 04:52:39 +00:00
Brenda Wallace d37c4139a6 Fixes error displaying plantings with no planted_at date 2019-07-02 04:52:39 +00:00
Brenda Wallace bf6cb5352d Test for displaying plantings on profile page 2019-07-02 04:52:39 +00:00
Brenda Wallace 97028bdf1d Refactoring member profile spec to use shared example 
so we can test the page both signed in and not signed in
 2019-07-02 04:52:39 +00:00
Brenda Wallace ce60d6bb0c Remove stray \n in translation 2019-07-01 10:28:39 +00:00
dependabot-preview[bot] 0870342871 Bump capybara from 3.24.0 to 3.25.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.24.0 to 3.25.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.24.0...3.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-29 02:07:39 +00:00
Brenda Wallace c4657f5972 Merge pull request #1942 from Br3nda/upgrade/bootstrap 
Upgrade to bootstrap 4
 2019-06-28 10:05:02 +12:00
Brenda Wallace fec37368ae Remove pyenv 2019-06-28 09:53:23 +12:00
Brenda Wallace 8faa712e07 be_success -> be_successfull 
fixes a deprecation warning
 2019-06-27 22:26:15 +12:00
Brenda Wallace b0a8288330 Merge branch 'dev' into upgrade/bootstrap 2019-06-27 22:18:06 +12:00
Brenda Wallace 6b7378c8f6 Merge branch 'master' into dev 2019-06-27 22:17:45 +12:00
Brenda Wallace b65f2e858f update rubocop to match codeclimate settings 2019-06-27 22:14:48 +12:00
Brenda Wallace fe7cb43c11 prettier links 2019-06-27 22:13:23 +12:00
Brenda Wallace f1097e0f7c update photos spec 2019-06-27 22:13:09 +12:00
Brenda Wallace 66a0d8f2d0 only show info+pagination if there are results to show 2019-06-27 22:06:54 +12:00
Brenda Wallace 952c1b9a2a styled and moved the signin/signup prompts 2019-06-27 22:04:54 +12:00
Brenda Wallace 9e69f0aae3 photos as cards 2019-06-27 22:00:46 +12:00
Brenda Wallace d4a4d61f6b tidy up photo display 2019-06-27 21:59:15 +12:00
Brenda Wallace 19085ed237 fixed link to harvest or plantings photos 2019-06-27 21:54:29 +12:00
Brenda Wallace d1e7ba701b fixing mobile display 2019-06-27 21:48:48 +12:00
Brenda Wallace c94b026c58 solving rubocop dependencies errors 2019-06-27 21:33:25 +12:00
Brenda Wallace 8b3adcf7a7 Rubocop fix up 2019-06-27 21:26:35 +12:00
Brenda Wallace b9e38719ce Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap 
Conflicts:
	Gemfile.lock
 2019-06-27 21:25:00 +12:00
Brenda Wallace 677b82a3d0 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-27 21:23:52 +12:00
dependabot-preview[bot] 1ae0558e4c Bump puma from 3.12.1 to 4.0.0 
Bumps [puma](https://github.com/puma/puma) from 3.12.1 to 4.0.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 02:48:00 +00:00
Brenda Wallace 70a69e7220 Update app/assets/stylesheets/_predictions.scss 2019-06-27 14:45:42 +12:00
Brenda Wallace 7f2afa718d Update app/assets/stylesheets/_predictions.scss 2019-06-27 14:45:22 +12:00
Brenda Wallace dc6034c01b Update app/assets/stylesheets/_variables.scss 2019-06-27 14:45:06 +12:00
Brenda Wallace ea2e0697a7 Update Gemfile 2019-06-27 14:44:30 +12:00
Brenda Wallace 99f97f51dc Update app/assets/stylesheets/_variables.scss 2019-06-27 14:43:38 +12:00
Brenda Wallace 9dada23e42 Marking the tests that fail as pending 
Until we fix in chrome head less
 2019-06-27 14:31:22 +12:00
dependabot-preview[bot] f2c6f27c10 Bump scout_apm from 2.5.0 to 2.5.1 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.5.0...v2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 19:25:47 +00:00
dependabot-preview[bot] 53636dc47a Bump rubocop from 0.71.0 to 0.72.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.71.0 to 0.72.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.71.0...v0.72.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 19:07:41 +00:00
Brenda Wallace 3bcfc88856 Add title to page 2019-06-26 16:30:55 +12:00
Brenda Wallace 1d98668ac4 scss lint 2019-06-26 16:21:59 +12:00
Brenda Wallace 88025b8a21 scss lint 2019-06-26 11:32:02 +12:00
Brenda Wallace c60162e415 scss lint 2019-06-26 11:31:37 +12:00
Brenda Wallace c702623c4f Prefer single quoted strings 2019-06-26 11:31:10 +12:00
Brenda Wallace 0324e515e0 scss lint 2019-06-26 11:30:47 +12:00