diff options
author | Job van der Voort <job@gitlab.com> | 2015-07-30 09:26:56 +0000 |
---|---|---|
committer | Job van der Voort <job@gitlab.com> | 2015-07-30 09:26:56 +0000 |
commit | ae36842d456f2bd028c8848f2e009141516087ee (patch) | |
tree | 46bcb4814ad5b95c2a701c1439d19e6a64cacbfe | |
parent | eb86e3ed46ae42c6dc7898b623396bb642d431cc (diff) | |
parent | 34c2867ca29e60af763bb420a308090994e68e73 (diff) | |
download | gitlab-ce-ae36842d456f2bd028c8848f2e009141516087ee.tar.gz |
Merge branch 'ssh-key-form' into 'master'
Switched the order of the SSH key form
Now it looks like this:
![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/dca3353266e93cec9cfd9f2f16af8657/image.png)
See merge request !1069
-rw-r--r-- | app/views/profiles/keys/_form.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml index f905417f0e2..b76a5b636ac 100644 --- a/app/views/profiles/keys/_form.html.haml +++ b/app/views/profiles/keys/_form.html.haml @@ -7,13 +7,12 @@ %li= msg .form-group - = f.label :title, class: 'control-label' - .col-sm-10= f.text_field :title, class: "form-control" - .form-group = f.label :key, class: 'control-label' .col-sm-10 = f.text_area :key, class: "form-control", rows: 8 - + .form-group + = f.label :title, class: 'control-label' + .col-sm-10= f.text_field :title, class: "form-control" .form-actions = f.submit 'Add key', class: "btn btn-create" |