Commit Graph

5496 Commits

Author SHA1 Message Date
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
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
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
Brenda Wallace
ea1fb90279 Create the search index 2018-09-09 11:55:19 +12:00
Brenda Wallace
53b08422ce Force new config when installing elasticsearch 2018-09-09 11:08:34 +12:00
Brenda Wallace
a051523354 Upgrade to elasticsearch 6.2.3 2018-09-09 10:56:21 +12:00
Brenda Wallace
5563b183dc Revert "Remove custom elastic search installer in travis"
This reverts commit d629203570.
2018-09-09 10:52:20 +12:00
Brenda Wallace
69f6c8d5de Merge branch 'dev' into upgrade/elasticsearch 2018-09-09 10:04:19 +12:00
Brenda Wallace
f69f0861d2 Style fix up 2018-09-09 10:04:02 +12:00
Brenda Wallace
d629203570 Remove custom elastic search installer in travis 2018-09-09 09:44:43 +12:00
Brenda Wallace
338e705db7 Upgrade elastic search gems 2018-09-09 09:44:27 +12:00
dependabot[bot]
dfc53747d9 Bump unicorn from 5.4.0 to 5.4.1
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.0 to 5.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-07 11:45:52 +12:00
brenda
2b8aac19dd Revert "Auto corrected by following Ruby Capybara/FeatureMethods"
This reverts commit b52763b7c2.
2018-09-07 10:40:09 +12:00