Download as
Browse Code »

Commit 4d846c09b1982016356256afeb40dd252215429b

Authored by Dmitriy Zaporozhets
1 parent 942c4101
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed spec

Showing 2 changed files with 2 additions and 3 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @4d846c0
... ... @@ -2,7 +2,7 @@
2 2 @include bg-gradient(#f7f7f7, #d5d5d5);
3 3 border-color:#aaa;
4 4 font-size: 13px;
5   - line-height: 17px;
  5 + line-height: 18px;
6 6 &:hover {
7 7 @include bg-gray-gradient;
8 8 border-color:#bbb;
... ... @@ -86,7 +86,7 @@
86 86  
87 87 &.small {
88 88 @extend .btn-small;
89   - line-height: 16px;
  89 + line-height: 18px;
90 90 }
91 91  
92 92 &.active {
... ...
spec/models/project_spec.rb
  Diff comments   View file @4d846c0
... ... @@ -37,7 +37,6 @@ describe Project do
37 37 it { should have_many(:hooks).dependent(:destroy) }
38 38 it { should have_many(:wikis).dependent(:destroy) }
39 39 it { should have_many(:protected_branches).dependent(:destroy) }
40   - it { should have_many(:services).dependent(:destroy) }
41 40 end
42 41  
43 42 describe "Mass assignment" do
... ...