Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock		2017-09-21 08:27:38 +02:00
..
environments	Merge pull request #752 from ZmagoD/testin-rails-5-addons	2017-08-25 08:05:21 +02:00
initializers	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +02:00
locales	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +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
puma.rb	setup sciNote for Rails 5.1	2017-06-23 15:19:08 +02:00
routes.rb	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +02:00
secrets.yml	Fixed some RoR 5.1 default settings. [SCI-1413]	2017-07-04 14:42:53 +02: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