Merge pull request #5827 from Razer6/remove_rails4_travis

Remove rails4 branch in travis configuration
Fix test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'bug/mr_duplicate_iids' of /home/git/repositories/gitlab/gitlabhq
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Fix emojii autocomplete

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq
Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBase

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Add  authenticity_token: true to multipart forms

Rails 4 does not generate token by default
It fixes bug when you get to sign-in page after trying to upload image
with comment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix broken UI for admin system hooks

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix header case

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Show MR accept info only if merge request is open

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Minor version upgrader

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Create branch for tag

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq
Allow non-interactive run of upgrade script. ruby script/upgrade.rb FORCE=yes

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Use 'ruby script/upgrade.rb -y'  instead of ENV

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'feature/minor_update_script' of /home/git/repositories/gitlab/gitlabhq
Add comment about tls for ldap method

`omniauth-ldap` also supports tls for ldap method
Fix dashboard event caching