Brenda Wallace 276accc314 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ...

Conflicts:
	Gemfile.lock

2018-12-30 13:02:02 +13:00

..

application_controller_renderer.rb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

assets.rb

Move application.js loading last again

2018-01-23 09:00:34 +13:00

backtrace_silencers.rb

Moving development to top level directory

2012-08-23 10:41:00 -07:00

comfortable_mexican_sofa.rb

Fixed linter issue, empty line after guard clause

2018-09-13 23:10:43 +12:00

cookies_serializer.rb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

devise.rb

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00

escaped_markdown.rb

Escaped_Markdown HAML filter, for use in RSS.

2013-05-16 15:08:50 +01:00

filter_parameter_logging.rb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

friendly_id.rb

wip: upgrading rspec

2014-11-15 22:55:37 +11:00

geocoder.rb

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00

growstuff_markdown.rb

Use growstuff markdown everywhere (except policy)

2013-11-11 10:33:20 +11:00

inflections.rb

Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

2018-12-30 13:02:02 +13:00

jsonapi_resources.rb

Add a default paginator for api responses

2017-11-13 19:19:18 +13:00

mime_types.rb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

new_framework_defaults_5_1.rb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

omniauth.rb

#645 Configure devise / omniauth in only one spot, to avoid CSRF errors

2015-08-21 12:21:55 +09:30

session_store.rb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

sidekiq.rb

Removed extra blank lines, & added a end of file

2016-11-16 12:52:48 +13:00

time_formats.rb

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00

wrap_parameters.rb

Reinstate json response config

2018-06-04 16:49:41 +12:00