diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-30 20:06:23 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-30 20:06:23 +0300 |
| commit | bcfcd243a635a1ce655440562897c3ef9603eda9 (patch) | |
| tree | edad3191744d41f967989dcf78b4bb0b87668039 /features | |
| parent | 4f0bfdb500b7f72a8e817d1224eaba6ed46204bc (diff) | |
| parent | 2f962a40e8e3d28cbe7f4988711361dffae900e2 (diff) | |
| download | gitlab-ce-bcfcd243a635a1ce655440562897c3ef9603eda9.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/commits/user_lookup.feature | 2 | ||||
| -rw-r--r-- | features/project/edit_issuetracker.feature | 2 | ||||
| -rw-r--r-- | features/steps/project/archived.rb | 2 | ||||
| -rw-r--r-- | features/steps/project/multiselect_blob.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/features/project/commits/user_lookup.feature b/features/project/commits/user_lookup.feature index f3864c0ab38..aa347e24fe4 100644 --- a/features/project/commits/user_lookup.feature +++ b/features/project/commits/user_lookup.feature @@ -11,4 +11,4 @@ Feature: Project Browse Commits User Lookup Scenario: I browse another commit from list Given I click on another commit link - Then I see other commit info
\ No newline at end of file + Then I see other commit info diff --git a/features/project/edit_issuetracker.feature b/features/project/edit_issuetracker.feature index b5477d3c7ab..cc0de07ca69 100644 --- a/features/project/edit_issuetracker.feature +++ b/features/project/edit_issuetracker.feature @@ -15,4 +15,4 @@ Feature: Project Issue Tracker When I visit edit project "Shop" page And change the issue tracker to "Redmine" And I save project - Then I the project should have "Redmine" as issue tracker
\ No newline at end of file + Then I the project should have "Redmine" as issue tracker diff --git a/features/steps/project/archived.rb b/features/steps/project/archived.rb index dfbe762c438..8b490d2ffc0 100644 --- a/features/steps/project/archived.rb +++ b/features/steps/project/archived.rb @@ -34,4 +34,4 @@ class ProjectArchived < Spinach::FeatureSteps click_link "Unarchive" end -end
\ No newline at end of file +end diff --git a/features/steps/project/multiselect_blob.rb b/features/steps/project/multiselect_blob.rb index 3d330e837c1..28df7bc9312 100644 --- a/features/steps/project/multiselect_blob.rb +++ b/features/steps/project/multiselect_blob.rb @@ -55,4 +55,4 @@ class ProjectMultiselectBlob < Spinach::FeatureSteps step 'I click on "Gemfile.lock" file in repo' do click_link "Gemfile.lock" end -end
\ No newline at end of file +end |