Commit graph

6 commits

Author SHA1 Message Date
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
zmagod 525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
Oleksii Kriuchykhin f2f57de264 Fix changing protocol ownership logic when removing user from the team [SCI-1415] 2017-06-26 15:30:18 +02:00
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
zmagod be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
zmagod a193850ae6 rename models where org/organization 2017-01-24 16:34:21 +01:00
Renamed from app/models/user_organization.rb (Browse further)