scinote-web/config
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master'
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
2018-11-14 16:59:04 +01:00
..
environments Add project controller unit tests [SCI-2732] 2018-10-23 19:51:50 +02:00
initializers Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
locales Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
routes Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
webpack
application.rb Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +02:00
boot.rb
cable.yml
cucumber.yml
database.yml
environment.rb
newrelic.yml
puma.rb
routes.rb Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
secrets.yml Rename sciNote -> SciNote (config/ folder) 2018-05-21 15:11:12 +02:00
spring.rb
webpacker.yml
whacamole.rb add whacamole configuration [fixes SCI-1683] 2017-10-25 09:47:26 +02:00