diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-30 16:38:27 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-30 16:38:27 +0200 |
| commit | 0930086bea914d4fd32c21706bcdcb3daf529561 (patch) | |
| tree | 77cce063c1ff1a1b153e9a08f68f86cc994b8f83 | |
| parent | 2010ae11f3e2a9b930ebd075c019225356558e14 (diff) | |
| download | gitlab-ce-0930086bea914d4fd32c21706bcdcb3daf529561.tar.gz | |
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 4 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 920702ff3c4..1f8ea85eb65 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -170,7 +170,3 @@ .merge-request-show-labels .label { padding: 6px 10px; } - -.mr-commits .commit { - padding: 10px 15px; -} diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index bd84abae06e..9d23f5da5de 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -113,7 +113,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps click_link 'Commits' end - within '.mr-commits' do + within '.commits' do click_link Commit.truncate_sha(sample_commit.id) end end |