Commit Graph
9 Commits
Author SHA1 Message Date
Douwe MaanandDmitriy Zaporozhets fe38be8be4 Merge branch 'fix-escaped-branches-in-compare' into 'master'
Unescape branch names in compare commit

The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash.

Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here).

* Closes #1399
* Closes https://github.com/gitlabhq/gitlabhq/issues/9105

See merge request !582
2015-05-06 14:43:36 +03:00
Dmitriy Zaporozhets 407489d606 Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'
Remove access control for uploaded images to fix broken images in emails

Replaces !530.

> This MR removes the access control for uploaded images. This is needed to display the images in emails again.
>
> The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
>
> If possible this should go into the 7.10 release.

See merge request !533
2015-04-20 12:48:25 +03:00
Robert Speicher 167a6b9eef Render a 404 when RefsController#logs_tree gets an HTML request
Fixes #2152
2015-04-06 23:08:28 -04:00
Douwe Maan 91761b0685 Add tests. 2015-03-31 13:37:21 +02:00
Stan Hu 4bc5c66fe1 Fix broken project_url routing when protected branches are accessed with an empty repo 2015-03-01 20:26:21 -08:00
Douwe Maan 769d1ce64b Fix spec. 2015-02-24 16:10:55 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
Douwe Maan 2570e4df79 Fix specs. 2015-02-20 16:55:38 +01:00
Douwe Maan d2ebdf664b Refactor. 2015-02-17 22:23:31 +01:00