diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-03 08:47:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-03 08:47:55 +0000 |
| commit | 317206300d56eb2fc4f7c3701151f47f8f1e6eef (patch) | |
| tree | ce000f92bbeae56cd7468053594eb4a9393444c1 /features | |
| parent | 0d0042d27481d31027a10edb2ba3a184bff5075a (diff) | |
| parent | dfd256f29ee817b5ffc563bb554a02d26ae44502 (diff) | |
| download | gitlab-ce-317206300d56eb2fc4f7c3701151f47f8f1e6eef.tar.gz | |
Merge branch 'configurable-attachment-size' into 'master'
Support configurable attachment size in Application Settings page
### What does this MR do?
This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page.
### Are there points in the code the reviewer needs to double check?
What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid.
### Why was this MR needed?
We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
See Issue #1258
### Screenshots
Before:
After:
See merge request !407
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/issues/issues.feature | 1 | ||||
| -rw-r--r-- | features/steps/project/issues/issues.rb | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index b9031f6f32b..af01c7058ea 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -42,6 +42,7 @@ Feature: Project Issues Given I visit issue page "Release 0.4" And I leave a comment like "XML attached" Then I should see comment "XML attached" + And I should see an error alert section within the comment form @javascript Scenario: I search issue diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index e8ca3f7c176..e2834d51a27 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -204,6 +204,12 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end end + step 'I should see an error alert section within the comment form' do + within(".js-main-target-form") do + find(".error-alert") + end + end + step 'The code block should be unchanged' do page.should have_content("```\nCommand [1]: /usr/local/bin/git , see [text](doc/text)\n```") end |