Merge pull request #7705 from dblessing/serialize_service_properties

Serialize service properties
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Typo localy -> locally.
Merge pull request #7726 from cirosantilli/typo-locally

Typo localy -> locally.
cleanup MySQL doc wording
url -> URL
url -> URL
Increase import timeout from 2 to 4 minutes

This file was missed in https://github.com/gitlabhq/gitlabhq/commit/4535db04b28996baf118bafeb77acd16065e5c5a.
Merge pull request #7732 from bbodenmiller/patch-13

Increase import timeout from 2 to 4 minutes
Merge pull request #7730 from bbodenmiller/patch-12

url -> URL
Merge pull request #7728 from bbodenmiller/patch-7

cleanup MySQL doc wording
Merge branch 'project-destroy-redirect' into 'master'

Redirect users to Projects Admin Page after removing a project

Fixes issue #543 by redirecting the user to "admin_projects_path" and displaying the flash alert "Project removed."

See merge request !178
Add an option to supply root password through an environmental variable.
Merge branch 'root_password_configurable' into 'master'

Root password configurable through environmental variable

Fixes #1522

See merge request !1084
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
update grant command to match how mysql shows

When looking up the granted permissions for users in MySQL using `show grants for 'git'@'localhost';` it shows the permissions in this order regardless of how you enter them. Changing so that comparing your actual permissions vs. what installation guide says is easier.
Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring
Update Gemfile.lock
Modified Gemfile.lock

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Make labels clickable

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