Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

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

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb

2015-07-02 17:07:02 +02:00

..

blame

Fix git blame syntax highlighting when different commits break up lines

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

blob

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04:00

branches

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04:00

commit

Support commenting on a diff in side-by-side view

2015-06-16 06:11:59 -07:00

commits

Merge branch 'ui-improvements' into 'master'

2015-07-01 09:40:44 +00:00

compare

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04:00

deploy_keys

Show key fingerprint on DeployKeys#index

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

diffs

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +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

Use to_reference menthod when render issue id in list

2015-07-01 09:46:37 +02:00

labels

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04:00

merge_requests

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-07-02 17:07:02 +02:00

milestones

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04:00

network

Remove requires-input from the Network Graph form

2015-06-26 22:49:32 -04:00

notes

Cache markdown of comments

2015-06-30 15:54:20 +02:00

project_members

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

2015-06-09 19:24:37 +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

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +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

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

_aside.html.haml

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

_bitbucket_import_modal.html.haml

Bootlint: Modals no longer need a '.hide' class

2015-06-16 13:32:33 -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

Bootlint: Modals no longer need a '.hide' class

2015-06-16 13:32:33 -04:00

_gitlab_import_modal.html.haml

Bootlint: Modals no longer need a '.hide' class

2015-06-16 13:32:33 -04:00

_home_panel.html.haml

Add a pipeline context option for SanitizationFilter

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

_md_preview.html.haml

Add negative tabindex to Markdown Write and Preview tabs

2015-06-10 16:34:51 -04:00

_merge_request_settings.html.haml

Dont allow approvals requirement be less than zero

2015-06-09 18:23:00 +02:00

_section.html.haml

Remove text since rss is now to prominent.

2015-06-12 11:58:18 +02:00

_zen.html.haml

Show a random Markdown tip in the textarea placeholder

2015-06-23 21:00:10 -04:00

edit.html.haml

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

2015-06-17 11:25:59 +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

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04: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