Merge branch 'master' into update_git_annex_docs

.gitlab-ci.yml

-# This file is generated by GitLab CI
+image: "ruby:2.1"
+
+services:
+  - mysql:latest
+  - postgres:latest
+  - redis:latest
+
+variables:
+  MYSQL_ALLOW_EMPTY_PASSWORD: "1"
+
 before_script:
   - ./scripts/prepare_build.sh
   - ruby -v

CHANGELOG-EE

-v 8.4.0 (unreleased)
+v 8.5.0 (unreleased)
+
+v 8.4.1
+  - No EE-specific changes
+
+v 8.4.0
   - Add ability to create a note for user by admin
   - Fix "Commit was rejected by git hook", when max_file_size was set null in project's Git hooks
   - Fix "Approvals are not reset after a new push is made if the request is coming from a fork"

app/views/admin/users/index.html.haml

@@ -74,7 +74,7 @@
           - else
             %i.fa.fa-user.cgreen
           = link_to user.name, [:admin, user]
-          - if user.note
+          - if user.note.present?
             = link_to "#", { "data-toggle" => "tooltip", title: user.note, class: "user-note"} do
               = icon("sticky-note-o cgrey")
           - if user.admin?