scinote-web/config
Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
..
environments Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400 2017-07-26 16:20:09 +02:00
initializers Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +02:00
locales Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +02:00
webpack Add Webpacker and React [SCI-1461] 2017-07-12 16:41:55 +02:00
application.rb Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +02:00
boot.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
cable.yml Reverted settings for WebSockets, because we might use redis subscription adapter. [SCI-1413] 2017-07-06 12:55:58 +02:00
cucumber.yml setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
database.yml setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
environment.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
newrelic.yml Adds new relic in sciNote [fixes SCI-1183] 2017-04-07 11:23:45 +02:00
puma.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
routes.rb Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00
secrets.yml Fixed some RoR 5.1 default settings. [SCI-1413] 2017-07-04 14:42:53 +02:00
skylight.yml Initial commit. 2016-02-12 16:52:43 +01:00
spring.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
webpacker.yml Add Webpacker and React [SCI-1461] 2017-07-12 16:41:55 +02:00