summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/sections/merge_requests.scss4
-rw-r--r--features/steps/project/merge_requests.rb2
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