From de6509cc97b6db1c06038914c39a69f49667e030 Mon Sep 17 00:00:00 2001 From: Jure Grabnar Date: Tue, 30 Apr 2019 16:40:12 +0200 Subject: [PATCH 1/2] Add distinct to #visible_to in project.rb Closes SCI-3375 --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 2d5eedf3c..d0dc5c557 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -47,7 +47,7 @@ class Project < ApplicationRecord .where( 'visibility = 1 OR user_projects.user_id = :id', id: user.id - ) + ).distinct end end) From 4c1a64ce4f00ca2cf63104fa269c526767421c0d Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Mon, 6 May 2019 14:19:32 +0200 Subject: [PATCH 2/2] Fix tags line up (#1722) --- app/assets/stylesheets/my_modules/protocols/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index 647c23fd8..cc88edeef 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -69,7 +69,7 @@ .select-container { float: right; position: relative; - width: calc(100% - 35px); + width: calc(100% - 40px); select { display: none;