This reverts commit e6707f6f, reversing
changes made to f88d30fa.

Fix avatars in the network graph for relative-url setups.

6.7.3 patch release

Conflicts:
	app/assets/javascripts/main.js.coffee

Dmitriy Zaporozhets authored 10 years ago and Jacob Vosmaer (GitLab) committed 10 years ago

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

Invoking 'db:schema:load' turned out to be a bad idea: when downgrading
an existing GitLab installation, the schema of the newer version would
be preserved when trying to import the old version.

Conflicts:
	CHANGELOG

The 'author_id_of_changes' attribute is not persisted in the database.
As we retrieve the merge request from the DB just before sending the
email, this attribute was always nil.

Also there was no tests for the merge notification code - tests have
been added.

Fix #6605

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

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

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

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

Update Install Doc Branch

/cc @marin

What Is A Bug

Fix http clone for public project

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

Update Upgrade Document for 6.7

Use the latest version of gitlab-shell which is 1.9.0

Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gitlabhq

 into dmedvinsky-username-keys-content-type

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

Conflicts:
	CHANGELOG

Replace gemoji with open source PhantomOpenEmoji

Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.

Cloud Update

/cc @jacobvosmaer @marin @job

Oauth Require Public Email

Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.

Deploy Key Doc

/cc @marin @job @jacobvosmaer

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

Changelog O'Reilly

added "Better API for access_levels" sponsorship from O'Reilly to CHANGELOG