scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-11 09:26:37 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/spec
History
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
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
rails_helper.rb
spec_helper.rb