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
Remove colored gem from upgrader script

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Remove colored gem from upgrader script. pt2

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
fix most of warnings
Add time ago tooltips to show actual date/time

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
Allow user to hide the message to add an ssh key permanently

Favor links instead of buttons

Remove unnecessary class

Remove extra space