summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-16 18:25:32 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-16 18:25:32 +0200
commit8f0a97da0498dbfab0ad98402bea577ee68abdab (patch)
treece4ad98aed029bac62df2577a690d01642874edf
parent4f2e9fb8e56249d3bcce128a50a6fa6b4deca00f (diff)
downloadgitlab-ce-8f0a97da0498dbfab0ad98402bea577ee68abdab.tar.gz
Add base64 encoding selector to new file UI so you can add image to repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/generic/files.scss2
-rw-r--r--app/views/projects/new_tree/show.html.haml6
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss
index 6607ae327e0..11bb715f7b5 100644
--- a/app/assets/stylesheets/generic/files.scss
+++ b/app/assets/stylesheets/generic/files.scss
@@ -45,7 +45,7 @@
text-align: center;
img {
padding: 100px;
- max-width: 300px;
+ max-width: 50%;
}
}
diff --git a/app/views/projects/new_tree/show.html.haml b/app/views/projects/new_tree/show.html.haml
index 078a4b80d0d..9d7c7afbeac 100644
--- a/app/views/projects/new_tree/show.html.haml
+++ b/app/views/projects/new_tree/show.html.haml
@@ -15,6 +15,12 @@
%span= @ref
.form-group.commit_message-group
+ = label_tag :encoding, class: "control-label" do
+ Encoding
+ .col-sm-10
+ = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control'
+
+ .form-group.commit_message-group
= label_tag 'commit_message', class: "control-label" do
Commit message
.col-sm-10