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

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

concerns

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

2014-06-17 10:53:44 +03:00

network

Remove grit require

2013-09-30 13:59:16 +03:00

project_services

Merge branch 'add_aborted_status' into 'master'

2014-06-10 16:25:40 +00:00

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Improve files/snippets action buttons

2014-06-13 20:21:48 +03:00

appearance.rb

Appearance model for custom signin page

2014-04-14 22:14:50 +03:00

broadcast_message.rb

Allow set broadcast color with 3 digits like #444

2014-06-04 11:04:36 +03:00

commit.rb

Detect closing issues in Merge Request description

2014-06-13 17:25:44 +02:00

deploy_key.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

deploy_keys_project.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

2014-03-27 09:15:25 +13:00

email.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

event.rb

Wipe wall notes feature

2014-06-13 14:24:54 +03:00

forked_project_link.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

git_hook.rb

Decline web editor action if commit message does not match one in project git hooks settings

2014-04-15 15:20:52 +03:00

group.rb

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

2014-06-17 10:53:44 +03:00

issue.rb

Implements drag and drop upload in creating issues

2014-05-23 16:22:42 +08:00

jira_issue.rb

Add a JiraIssue class

2014-06-13 15:40:09 +02:00

key.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

merge_request_diff.rb

Add CompareAction class for collecting commits and diffs using satellites

2014-05-07 16:14:24 +03:00

merge_request.rb

Detect closing issues in Merge Request description

2014-06-13 17:25:44 +02:00

milestone.rb

Migrate invalid rows with missing iids or duplicates

2014-04-24 19:39:33 +02:00

namespace.rb

Refactor some search scopes to prevent wierd behaviour and PG::Error issues

2014-06-05 20:37:35 +03:00

note.rb

Wipe wall notes feature

2014-06-13 14:24:54 +03:00

notification.rb

Improve notification settings page

2014-02-17 18:06:24 +02:00

personal_snippet.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

project_group_link.rb

Remove copyright licenses missed in 0fdab6a747.

2014-06-02 09:11:24 +02:00

project_hook.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

project_snippet.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

project_team.rb

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

2014-06-17 10:53:44 +03:00

project_wiki.rb

Allow nested files in wiki.

2014-04-28 16:22:31 +02:00

project.rb

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

2014-06-17 10:53:44 +03:00

protected_branch.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

repository.rb

Use gitlab_git to get commit_count in repo. It allows get commits count for git repos with 100k+ commits

2014-06-11 23:13:31 +03:00

service_hook.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

service.rb

Backport CI service refactoring from EE

2014-05-28 11:35:43 +03:00

snippet.rb

Rename snippets scopes to plural names.

2014-06-04 08:37:19 +02:00

system_hook.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

tree.rb

Use new gitlab_git gem. It makes CONTRIBUTING.md work

2014-02-27 15:52:14 +02:00

user.rb

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

2014-06-17 10:53:44 +03:00

users_group.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

users_project.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

web_hook.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

wiki_page.rb

A bit clearer naming for gollum_wiki.

2014-05-05 14:01:48 +02:00