Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md

2015-06-08 18:24:34 +02:00

..

blame

Fix git blame syntax highlighting when different commits break up lines

2015-05-27 14:10:58 -07:00

blob

Refactor web editor

2015-06-05 15:01:38 +02:00

branches

Add Merge Request button to branches page.

2015-05-09 22:55:19 +02:00

commit

Include commit message in page title.

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

commits

Fix Atom feeds.

2015-05-21 11:39:33 +02:00

compare

Add Create Merge Request buttons to commits page and push event.

2015-05-09 22:26:52 +02:00

deploy_keys

Show key fingerprint on DeployKeys#index

2015-06-03 18:03:04 -04:00

diffs

Fix diff header with submodule change

2015-05-29 11:01:40 +02: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 support for Webhook note events

2015-05-21 23:48:16 -04:00

imports

Add a page title to every page.

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

issues

Show warning when a comment will add 10 or more people to the discussion.

2015-06-05 12:07:13 +02:00

labels

Omit link to generate labels if user does not have access to create them

2015-06-01 22:42:53 -07:00

merge_requests

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

2015-06-08 18:24:34 +02:00

milestones

Show warning when a comment will add 10 or more people to the discussion.

2015-06-05 12:07:13 +02:00

network

Include ref in network page title.

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

notes

Show warning when a comment will add 10 or more people to the discussion.

2015-06-05 12:07:13 +02:00

project_members

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

2015-06-05 11:40:36 +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

Fix alignment of ref picker, breadcrumb and buttons.

2015-05-12 10:27:17 +02:00

wikis

Show warning when a comment will add 10 or more people to the discussion.

2015-06-05 12:07:13 +02:00

_aside.html.haml

Improve UI of project sidebar

2015-05-29 18:12:31 +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

_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

Add a pipeline context option for SanitizationFilter

2015-06-02 13:04:10 -04:00

_issuable_form.html.haml

Show warning when a comment will add 10 or more people to the discussion.

2015-06-05 12:07:13 +02:00

_md_preview.html.haml

Prefer jQuery on to bind, and don't use .js class.

2015-06-05 12:13:02 +02:00

_section.html.haml

Add icons to more tabs.

2015-05-12 10:27:17 +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

Move clone panel to sidebar

2015-05-05 13:09:50 +03: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

Fix Atom feeds.

2015-05-21 11:39:33 +02:00

show.html.haml

Fix project description and avatar alignment

2015-05-05 19:25:18 +03:00

transfer.js.haml

Upgrade to Rails 4.1.9

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

update.js.haml

Move jQuery enable/disable extensions to extensions/jquery

2015-06-02 20:32:07 -04:00