Merge branch '735-switch-labels-and-weight' into 'master'

Moved weight under labels

## What does this MR do?

Moves the 'weight' input under the 'labels' input on issuable creation forms.

## Are there points in the code the reviewer needs to double check?

Is this the only place this is required?

## Why was this MR needed?

UX.

## What are the relevant issue numbers?

Closes #735.

## Screenshots (if relevant)

![Screen_Shot_2016-06-28_at_23.11.33](/uploads/e2a460ed872b50ef9553b4b4e491f98d/Screen_Shot_2016-06-28_at_23.11.33.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !505

app/views/shared/issuable/_form.html.haml

@@ -71,13 +71,6 @@
           - if can? current_user, :admin_milestone, issuable.project
             %div
               = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
-      - if issuable.respond_to?(:weight)
-        .form-group
-          = f.label :label_ids, class: "control-label #{"col-lg-4" if has_due_date}" do
-            Weight
-          .col-sm-10{ class: ("col-lg-8" if has_due_date) }
-            = f.select :weight, issues_weight_options(issuable.weight, edit: true), { include_blank: true },
-              { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
       .form-group
         - has_labels = issuable.project.labels.any?
         = f.label :label_ids, "Labels", class: "control-label #{"col-lg-4" if has_due_date}"
@@ -91,6 +84,13 @@
           - if can? current_user, :admin_label, issuable.project
             %div
               = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+      - if issuable.respond_to?(:weight)
+        .form-group
+          = f.label :label_ids, class: "control-label #{"col-lg-4" if has_due_date}" do
+            Weight
+          .col-sm-10{ class: ("col-lg-8" if has_due_date) }
+            = f.select :weight, issues_weight_options(issuable.weight, edit: true), { include_blank: true },
+              { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
     - if has_due_date
       .col-lg-6
         .form-group