delta/gitlab/gitlab-ce.git/app/controllers/projects_controller.rb, branch shell-version-warning

Update html-pipeline and emoji

2015-03-11T23:05:01+00:00

Fix tests for project removing

2015-03-11T04:56:19+00:00

Render go-import meta tag for private repos.

2015-03-03T10:22:30+00:00

Introduce shortcuts for routing helpers

2015-02-26T03:34:16+00:00

Merge branch 'master' into extend_markdown_upload

2015-02-25T10:59:25+00:00

# Conflicts:
#	app/controllers/files_controller.rb

Merge branch 'master' into extend_markdown_upload

2015-02-24T13:54:39+00:00

# 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

Fix 404 when deleting a project

2015-02-24T00:19:03+00:00

The deletion from the admin section was redirecting to the wrong address.

Merge branch 'extend_markdown_upload' into generic-uploads

2015-02-20T14:37:37+00:00

# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb

Merge branch 'master' into rails-4.1.9

2015-02-20T03:53:05+00:00

Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml

Fix event loading with associations

2015-02-18T17:38:46+00:00