Conflicts:
	CHANGELOG
	VERSION

Automate upgrader shell version

/cc @marin

See merge request !1237

Remove unused javascript

projects:teams:members:index doesn't exists

See merge request !234

Better merge request manual instructions

I noticed the current instructions for manually merging a merge request that was submitted from a fork could create unnecessary merge requests or strange history. Imagine this:

1. Alice creates a repository and commits / pushes a single commit with SHA1 `A` to `master`.
2. Bob forks this repository and creates a new branch `myfeature` on `master` (`A`)
3. Alice commits `B` to `master` (which has the parent `A`)
4. Bob creates two commits on `myfeature` `P` and `Q`.
5. Bob submits the merge request to merge his `myfeature` into Alice's `master` branch.
6. Alice follows the manual merge request instructions:
  1. `git checkout -b bob/repo-myfeature master`
  2. `git pull http://... myfeature`

The branch `bob/repo-myfeature` was created from Alice's current `master`, which was `B`. When the `pull` is executed, git will fetch Bob's branch and then merged the fetched branch `Q` into the current branch's location `B`. This creates an unnecessary merge commit from `master` into the branch Alice is trying to merge. No harm is done, but the history is a bit messier.

This is even worse if Alice has set `git pull` to rebase by default. In this case, the commit `B` is rebased on top of `Q`. When Alice checks out `master` and merges in the branch, there will actually be a duplicate `B` commit.

These new instructions instead tell the user to fetch Bob's `myfeature` branch. This will fetch the necessary commits `P` and `Q` and create a temporary ref `FETCH_HEAD` pointing to `Q`. Alice will then create her local `bob/repo-myfeature` branch starting at `FETCH_HEAD`. No unnecessary merge commits, and no accidental rebasing.

See merge request !16

This reverts commit a9fadce3.

This reverts commit 280822cd.

Make project title link to project homepage

Nginx updates

minor updates @ formatting changes to match other versions of file.
Unify formatting of
https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/nginx/gitlab,
https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/nginx/gitlab-ssl,
&
https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb

Factor GITLAB_SHELL_VERSION get method

Don't enable IPv4 *only* on nginx.

I came across this issue when initially setting up gitlab and fixed it locally. Today, helping someone else set up their own instance, I came across this issue again:

The sample nginx configuration files disable IPv6 by default, making the server inaccesible unless the remote node has native IPv4. IPv4->IPv6 transition mechanisms don't help if the server have proper IPv6 DNS records in-place, which was the case for both of my servers.

This branch enables IPv4 and IPv6 by default. Older servers with no external IPv6 connectivity will not fail since they'll have a local-link IPv6 address to bind to anyway.

See merge request !231

Create dev fixture projects with fixed visibility

Do not require immediate password reset if specifying a password

Fix attachment ui

Fixes #1571

See merge request !1244

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

Improve white code highlight in comments and wiki

![Screenshot 2014-11-05 16.36.55](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5723848593/Screenshot_2014-11-05_16.36.55.png)

See merge request !1241

Do not mention MR if commit is a part of MR

See merge request !1242

Fix system_silent call

Origin request has been provided by our contributor @cirosantilli. We had to revert it and rework.

origin commit - https://dev.gitlab.org/gitlab/gitlabhq/commit/0b1084a4538bc46684c8620410988d3b1093e7ab

See merge request !1243

This reverts commit b33d4bc2.

This reverts commit 0b1084a4.

Factor using Repository#path_to_repo

Update GitLab CI service to work with new GitLab CI

See merge request !1239

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

Remove unnecessary authorisations

Because we already check read_project ability in `before_filter :project`

See merge request !1240

Remove unused authenticate_user from project#show

Remove dead Event#new_branch? method

Don't output to stdout from lib non-interactive methods [failure unrelated]

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

Factor '0' * 40 blank ref constants [failure unrelated]