scinote-web/spec
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
2018-04-12 13:16:46 +02:00
..
controllers fixes failing specs 2018-04-04 14:44:32 +02:00
factories Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +01:00
fixtures/files refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024] 2018-03-02 13:39:22 +01:00
lib/tasks fix failing spec 2018-03-13 15:03:48 +01:00
models Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 2018-04-12 13:16:46 +02:00
services Merge pull request #1073 from ZmagoD/zd_SCI_2206 2018-04-04 15:39:59 +02:00
support fixes failing specs 2018-04-04 14:44:32 +02:00
utilities/repository_import_parser refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024] 2018-03-02 13:39:22 +01:00
rails_helper.rb refactor repository export [fixes SCI-2025] 2018-03-05 15:54:04 +01:00
spec_helper.rb fixes failing tests 2017-10-27 09:35:39 +02:00