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

..

blame

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

blob

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

branches

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

commit

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

commits

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

compare

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

deploy_keys

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

diffs

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

forks

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

graphs

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

hooks

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

imports

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

issues

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

labels

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

merge_requests

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

milestones

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

network

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

notes

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

protected_branches

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

refs

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

repositories

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

services

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

snippets

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

tags

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

team_members

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

tree

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

wikis

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

_commit_button.html.haml

Make new and edit file submit more uniform

2014-10-08 10:01:07 +02:00

_dropdown.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_errors.html.haml

alert-error to alert-danger

2013-12-31 16:34:14 +02:00

_github_import_modal.html.haml

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08:00

_gitlab_import_modal.html.haml

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08:00

_home_panel.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

_issuable_form.html.haml

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

_md_preview.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

_settings_nav.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_visibility_level.html.haml

Update bootstrap-sass gem

2015-02-19 15:02:49 -08:00

_zen.html.haml

Fix tabindex for comment form

2015-01-15 10:34:40 -08:00

edit.html.haml

Correct spelling of 'a project avatar'

2015-02-23 15:10:56 +01:00

empty.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

new.html.haml

Render gitlab.com import block only if host is not gitlab.com

2015-02-21 11:14:17 -08:00

no_repo.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

show.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-22 07:55:30 -07:00

transfer.js.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

update.js.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00