Conflicts:
	db/schema.rb

Add Rspec tests for the new UpdateSnippetService and
CreateSnippetService classes.

Allow authors and admins to update the visibility level of personal and
project snippets.

Restyle import

Render import providers in one line and make it buttons

See merge request !1699

More flatly

* use sass variables for repeating colors
* use more of Flatly theme variables
* refactor buttons

See merge request !1698

Unblock user if they were unblocked in AD.

Fixes problem with !1687.

See merge request !1694

Fix typo in CHANGELOG.md

Fix failing tests

Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this.

See merge request !390

This reverts commit 07f9a3f9, reversing
changes made to 48036751.

Reverted this because the data is used in hooks as well.

Follow on to MR 376

Follow-on to MR 376 from @haynes . Remove unnecessary fetch of commit messages for initial push. This will reduce the memory usage significantly.

See merge request !387

Bump gitlab_git to 7.1.1

Verify found object is actually a commit in Commit.find.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1204

See merge request !1696

Minor cleanup around UTF-8 encoding.

Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in.

See merge request !1642

Verify found object is actually a commit in Commit.find

Execute hooks and services when branch or tag is created or deleted through web interface.

Fixes #2095.

Split up into commits to make it easier to see why what was changed :)

See merge request !1692

Use custom LDAP label in LDAP signin form.

Addresses https://dev.gitlab.org/gitlab/gitlab-ee/issues/238

![Screen_Shot_2015-03-13_at_15.43.19](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e9f0d1ed7238701ecdbaa54d4f538d89/Screen_Shot_2015-03-13_at_15.43.19.png)

See merge request !1693

Remove unnecessary fetch of commit messages for initial push. This will reduce the memory usage significantly.

Fix import pages not working after first load.

Fixes #2102.

`OAuth2::Client` was deleting keys from the options hash in place, which made it incomplete the next time the import page was loaded. We dup it so this no longer happens.

See merge request !1691

Update Webhook documentation for tag and tag push events

Just a quick update to include the `object_kind` field in the Webhooks documentation.

See merge request !389