diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index 5f44362ffee198a64dd679fef89c8fcc52587630..b66723d4cd0a01e2bc0226d43f7b6d6abbfdea46 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -2,7 +2,7 @@ @include bg-gradient(#f7f7f7, #d5d5d5); border-color:#aaa; font-size: 13px; - line-height: 17px; + line-height: 18px; &:hover { @include bg-gray-gradient; border-color:#bbb; @@ -86,7 +86,7 @@ &.small { @extend .btn-small; - line-height: 16px; + line-height: 18px; } &.active { diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 4f7afd9dd2522901786a86488bfcb5e933f87dda..5bcab924496051bfd01f2344c798d163f0f03404 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -37,7 +37,6 @@ describe Project do it { should have_many(:hooks).dependent(:destroy) } it { should have_many(:wikis).dependent(:destroy) } it { should have_many(:protected_branches).dependent(:destroy) } - it { should have_many(:services).dependent(:destroy) } end describe "Mass assignment" do