Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee ...

# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb

2015-05-05 10:18:27 +02:00

..

blame

Add a page title to every page.

2015-04-30 19:12:15 +02:00

blob

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

branches

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

commit

Include commit message in page title.

2015-04-30 21:12:31 +02:00

commits

Add a page title to every page.

2015-04-30 19:12:15 +02:00

compare

Add a page title to every page.

2015-04-30 19:12:15 +02:00

deploy_keys

Add a page title to every page.

2015-04-30 19:12:15 +02:00

diffs

Fix "Revspec not found" errors when viewing diffs in a forked project with submodules

2015-04-27 20:42:38 -07:00

forks

Add a page title to every page.

2015-04-30 19:12:15 +02:00

git_hooks

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

graphs

Add a page title to every page.

2015-04-30 19:12:15 +02:00

group_links

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

hooks

Add a page title to every page.

2015-04-30 19:12:15 +02:00

imports

Add a page title to every page.

2015-04-30 19:12:15 +02:00

issues

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

labels

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

merge_requests

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

milestones

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

network

Include ref in network page title.

2015-04-30 21:14:26 +02:00

notes

Fix merge request comments on files with multiple commits

2015-04-15 18:23:57 +02:00

project_members

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

protected_branches

Add a page title to every page.

2015-04-30 19:12:15 +02:00

refs

Fixed issue where only 25 commits would load in file listings

2015-03-30 19:31:13 +01:00

repositories

Align project download button with others in sidebar on project home page

2015-04-14 17:08:01 +03:00

services

Add a page title to every page.

2015-04-30 19:12:15 +02:00

snippets

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

tags

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

tree

Have tree page title read "Files" for root.

2015-04-30 21:18:27 +02:00

wikis

Capitalize "Git Access" in page title.

2015-04-30 21:15:56 +02:00

_bitbucket_import_modal.html.haml

Fix link to bitbucket import documentation

2015-03-08 22:26:46 -04:00

_commit_button.html.haml

Remove mention of branch to commit to.

2015-03-19 17:43:21 -07:00

_dropdown.html.haml

Add icons to Add dropdown items.

2015-04-06 15:13:50 +02:00

_errors.html.haml

alert-error to alert-danger

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

_github_import_modal.html.haml

Add Bitbucket integration docs.

2015-02-24 15:07:25 +01:00

_gitlab_import_modal.html.haml

Add Bitbucket integration docs.

2015-02-24 15:07:25 +01:00

_home_panel.html.haml

Refactor star btn logic for non-logged in user and fix tests

2015-03-29 18:50:45 -07:00

_issuable_form.html.haml

Fix tests and unassigned filter for issues. Updated CHANGELOG

2015-03-27 00:27:51 -07:00

_md_preview.html.haml

Make issue preview look like the result

2015-04-21 22:16:53 +02:00

_zen.html.haml

Fix tabindex for comment form

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

edit.html.haml

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

empty.html.haml

improve new project options

2015-04-20 03:13:39 -07:00

go_import.html.haml

Render go-import meta tag for private repos.

2015-03-03 11:22:30 +01:00

new.html.haml

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

no_repo.html.haml

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

show.atom.builder

Remove unnecessary private_token params.

2015-04-23 17:11:39 +02:00

show.html.haml

Fix wrong placement of show-aside link

2015-04-27 00:43:02 +02: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