Be sure that admin_group exists before trying to check for user membership.

Related to #257

See merge request !334

Ignore case of LDAP user DN when checking group membership.

Fixes #254.

See merge request !336

Add sleep while selecting access level in feature.

See merge request !341

Update git attributes for changelog-ee

See merge request !337

Remove duplicate Settings link in admin area.

Fixes #250

See merge request !330

Add documentation about help txt page.

Related to #240

See merge request !332

Add changelog entry for SSH key prefix stripping.

See merge request !335

CE to EE

See merge request !333

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

Ignore LDAP SSH key prefix and invalid keys.

See #214 and #230.

cc @job

See merge request !327

Reduce amount of sql queries on dashboard projects page

For https://github.com/gitlabhq/gitlabhq/issues/7218

See merge request !1613

Factor permission check in issuable finder

Remove useless `assets.compress` option, Rails 4 uses only `assets.js_co...

Fix for TeamCity buildQueue REST API build/@branchName.

Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service

Conflicts:
	app/controllers/projects/services_controller.rb

Improve login screen when only OmniAuth providers are enabled

Allow a user to specify a channel and username for the slack-webhook

Recent changes from CE master

See merge request !325

Support referencing issues to a project whose name starts with a digit

Gitlab supports adding users or projects whose name starts with a "_" or a digit, but the regexp in markdown.rb enforces "a-zA-Z" for the first character.

This change allows to reference issues or merge requests in other projects whose name starts with a digit, like `owner/2ndtestproject#123` or `2nduser/superproject!123`.

See merge request !264

Fix protected branches routing

### Summary

On the master branch, if you attempt to access the protected branches in the project settings with an empty repo, you get `NoMethodError - undefined method "project_url"`.

### Steps to reproduce

1. Check out GitLab master and run.
2. Create a new project.
3. Go to Settings.
4. Click on "Protected branches"

### Expected behavior

The controller is supposed to redirect back to the projects page since there are no branches.

### Observed behavior

Internal Error 500

### Relevant logs

```
NoMethodError - undefined method `project_url' for #<Projects::ProtectedBranchesController:0x007fd920054af0>:
  app/controllers/application_controller.rb:157:in `method_missing'
  actionpack (4.1.9) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url'
  actionpack (4.1.9) lib/action_dispatch/routing/url_for.rb:161:in `url_for'
  actionpack (4.1.9) lib/action_controller/metal/redirecting.rb:91:in `_compute_redirect_to_location'
  turbolinks (2.0.0) lib/turbolinks.rb:15:in `_compute_redirect_to_location_with_xhr_referer'
  actionpack (4.1.9) lib/action_controller/metal/redirecting.rb:71:in `redirect_to
```

### Fix

I added a unit test for the empty project case and replicated the issue. I added the URL router helpers that appear to be necessary after 42387b73.

See merge request !359

Link logs documentation in audit events document.

Related to gitlab/gitlabhq#1979

See merge request !329

[bugfix] Merge request diff view behaviour fix

More reasons why prefixing is good

Inspired by http://www.dwheeler.com/essays/filenames-in-shell.html

See merge request !1604

Add comment about note attachment redirect.

See merge request !1612

New Issue Header

Fixes #2073

- I've switched it from "New Issue" to "Create Issue". Small change, but grammatically correct.

See merge request !1611

This is what’s actually allowed when creating a user or a project in gitlab.

Irker is a gateway which sends IRC messages on git updates. This new
service provides an interface to this gateway, integrated in Gitlab, for
each updates.
As per the guidelines, this commit adds the new feature in the
CHANGELOG, tests and documentation.

See http://www.catb.org/esr/irker/

Error in docs for closing an issue

API docs for issues says you set parameter 'closed' to '1'.  I was not able to do that but I could set 'state_event' to 'close' which closed the issue.

Does not work
"https://gitlab.com/api/v3/projects/:id/issues/:issue_id?closed=1"

Does work
"https://gitlab.com/api/v3/projects/:id/issues/:issue_id?state_event=close"

See merge request !342