mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-25 02:05:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,452 Commits 64 Branches 76 Tags
feff2cdfd43b796b2356dbc9d5fe60bbdd27be40
Commit Graph

3452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel O'Connor
feff2cdfd4 Upgrade rake only 2016-12-12 10:38:31 +10:30
Daniel O'Connor
74657abec0 Revert "Update rake and rubocop" 
This reverts commit c9127dbf1e.
 2016-12-12 10:37:45 +10:30
Daniel O'Connor
6ff3fa21e1 Revert "Disable Style/EmptyMethod for now" 
This reverts commit 5235b11905.
 2016-12-12 10:37:26 +10:30
Daniel O'Connor
be572b9a53 Upgrade 2016-12-09 11:25:03 +10:30
Daniel O'Connor
5235b11905 Disable Style/EmptyMethod for now 2016-12-09 11:17:54 +10:30
Daniel O'Connor
d3d3731fa3 Update minitest 2016-12-09 10:52:01 +10:30
Daniel O'Connor
1982dc76be Pin to elasticsearch API 2.0 for now 2016-12-09 10:51:13 +10:30
Daniel O'Connor
c9127dbf1e Update rake and rubocop 2016-12-09 10:46:22 +10:30
Daniel O'Connor
f7ca706e0b Update omniauth-facebook (not as scary as it sounds - https://github.com/mkdynamic/omniauth-facebook/blob/master/CHANGELOG.md) 2016-12-09 10:25:08 +10:30
Daniel O'Connor
817c1ec5ce Update will_paginate 2016-12-09 10:24:18 +10:30
Daniel O'Connor
18ab47eed3 Update thor 2016-12-09 10:23:24 +10:30
Daniel O'Connor
d99f24c02c Update coffee-script-source 2016-12-09 10:22:32 +10:30
Daniel O'Connor
aaaca81d49 Update hashie 2016-12-09 10:21:31 +10:30
Daniel O'Connor
59ec36320b Update codeclimate-test-reporter 2016-12-09 10:20:47 +10:30
Daniel O'Connor
303fd8c243 Update autoprefixer-rails 2016-12-09 10:20:09 +10:30
Daniel O'Connor
3e43a19e58 Update CONTRIBUTING.md 
Dead link, no archived version of it
 2016-12-09 10:09:04 +10:30
Shiny
46a0956f5f Merge pull request #1124 from Br3nda/bw/load-resource 
Cancan already loads the resource
 2016-12-09 07:29:28 +13:00
Brenda Wallace
4f465d808c We don't need to load the resource again 2016-12-07 23:54:03 +00:00
Shiny
aea935be4b Merge pull request #1122 from Br3nda/bw/duplicate-query 
Gardens query was running twice in contoller
 2016-12-08 12:32:20 +13:00
Brenda Wallace
e695d5646a FIX Gardens query was running twice in contoller 2016-12-07 22:27:17 +00:00
Daniel O'Connor
e799233fb7 Merge pull request #1119 from Br3nda/bw/ParenthesesAsGroupedExpression 
Fixed parentheses that are interp-ed as grouped expression
 2016-12-07 12:30:38 +10:30
Shiny
00e240c038 Merge branch 'dev' into bw/ParenthesesAsGroupedExpression 2016-12-07 10:06:50 +13:00
Brenda Wallace
05e7a27782 Call to verify options stays as a hash 2016-12-07 10:04:17 +13:00
Mackenzie
53477485ef Merge pull request #1117 from Br3nda/bw/AmbiguousOperator 
Fixed AmbiguousOperator
 2016-12-06 12:40:21 -05:00
Mackenzie
c760112e1b Merge pull request #1118 from Br3nda/bw/assignment-in-condition 
Don't use assignments in conditions
 2016-12-06 12:40:00 -05:00
Mackenzie
0e8146b7ee Merge pull request #1120 from Br3nda/bw/more-enwikipedia-chars 
Yet another wikipedia url char added to regex
 2016-12-06 12:39:33 -05:00
Brenda Wallace
a7bafafa06 Yet another wikipedia url char added to regex 2016-12-06 21:58:17 +13:00
Brenda Wallace
464c570d99 Fixed parentheses that are interp-ed as grouped expression 2016-12-06 21:23:55 +13:00
Brenda Wallace
abc5ac5f29 Don't use assignments in conditions 2016-12-06 21:18:13 +13:00
Brenda Wallace
4c6f0fc929 Fixed AmbiguousOperator 2016-12-06 21:09:39 +13:00
Daniel O'Connor
41e408b04a Merge pull request #1116 from Br3nda/bw/returns 
Removed redundant returns
 2016-12-06 11:20:45 +10:30
Brenda Wallace
8981a222ea Simplified display_weight 2016-12-06 00:32:20 +00:00
Brenda Wallace
91b0c1898e Simplifying display_harvest_description 2016-12-05 20:40:34 +00:00
Brenda Wallace
26e5a414cf Line no longer needs wrapping 2016-12-04 21:23:33 +00:00
Brenda Wallace
92195d51d2 Removed redundant returns 2016-12-04 21:21:35 +00:00
Shiny
0fcd8c8e8c Merge pull request #1094 from Br3nda/bw/useless-assignments 
Useless assignments fixed, and rails 4 stuff.
 2016-12-05 10:06:03 +13:00
Daniel O'Connor
c43ec3d256 Merge branch 'dev' into bw/useless-assignments 2016-12-04 10:30:41 +10:30
Daniel O'Connor
1ae9366076 Merge pull request #1109 from maco/seed_photos 
add photos to seeds
 2016-12-04 10:30:07 +10:30
Daniel O'Connor
8bb6df6ca7 Merge branch 'dev' into seed_photos 2016-12-03 16:47:13 +10:30
Daniel O'Connor
afbdd1194f Merge branch 'dev' into bw/useless-assignments 2016-12-03 16:43:11 +10:30
Mackenzie Morgan
c2de65e515 Merge branch 'seed_photos' of gitmaco:maco/growstuff into seed_photos 2016-12-02 23:18:05 -05:00
Mackenzie Morgan
c201200e9b correct schema and add index for photos_seeds 2016-12-02 23:17:01 -05:00
Mackenzie
04ba871949 Merge pull request #1108 from maco/fix_photo_requires 
WIP: add require_relative to photo_capable concern for constants
 2016-12-02 23:13:56 -05:00
Shiny
7785a9d797 Merge branch 'dev' into seed_photos 2016-12-03 09:31:20 +13:00
Shiny
1388aa3b06 Merge branch 'dev' into bw/useless-assignments 2016-12-03 08:23:19 +13:00
Mackenzie
519cf80200 Merge pull request #1111 from CloCkWeRX/658_automation 
issue #658 i18n automation (updated)
 2016-12-02 08:26:15 -05:00
pozorvlak
ce9e20b2f1 Merge branch 'dev' into 658_automation 2016-12-02 13:06:56 +00:00
Shiny
0c2a60ecc3 Reduce max AbcSize to 38 (#1112) 
Reduce how complex methods are allowed to be, according to our code checker, so we're forced to write readable code
 2016-12-02 08:06:53 -05:00
Mackenzie
fa1e46c2e7 Merge pull request #1110 from maco/codeclimate_ignores 
ignore the minified bootstrap accessibility file for code climate checks
 2016-12-02 08:02:47 -05:00
pozorvlak
7b0d17af59 Merge branch 'dev' into 658_automation 2016-12-02 12:05:05 +00:00