diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-20 15:37:37 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-20 15:37:37 +0100 |
| commit | 218283b368161130f43333e75629870c9649b319 (patch) | |
| tree | c266f2c98aa3b199569a482fc0a651c484dd486f /app/views/projects/milestones | |
| parent | 4ef6ffaad3e9b7a29b438722e5e101de78521ec7 (diff) | |
| parent | 65b125a5035cb021aeb81e168fd4ae1ad6c74c11 (diff) | |
| download | gitlab-ce-218283b368161130f43333e75629870c9649b319.tar.gz | |
Merge branch 'extend_markdown_upload' into generic-uploads
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
Diffstat (limited to 'app/views/projects/milestones')
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index b3b170d7114..dbcd23eee05 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -25,7 +25,7 @@ = render 'projects/zen', f: f, attr: :description, classes: 'description form-control' .hint .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. - .pull-left Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. + .pull-left Attach files by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. .clearfix .error-alert .col-md-6 @@ -51,4 +51,4 @@ onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) } }).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $('#milestone_due_date').val())); - window.project_image_path_upload = "#{upload_image_project_path @project}"; + window.project_uploads_path = "#{project_uploads_path @project}"; |