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

Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb

2015-03-11 18:41:41 -07:00

..

concerns

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

2015-03-11 18:41:41 -07:00

hooks

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

members

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

network

Merge pull request #7999 from cirosantilli/append-inplace

2015-01-21 23:07:15 -08:00

project_services

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

2015-03-11 18:41:41 -07:00

.gitkeep

init commit

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

ability.rb

Append in place for strings and arrays

2015-01-01 21:12:00 +01:00

appearance.rb

Improve GitLab EE appearance

2015-03-03 22:04:25 -08:00

application_setting.rb

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

2015-03-11 18:41:41 -07:00

audit_event.rb

Use hash instead of json.

2014-11-21 15:58:21 +01:00

broadcast_message.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

commit.rb

Rubocop: Style/ElseAlignment enabled

2015-02-02 21:38:50 -08:00

deploy_key.rb

Re-annotate models

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

deploy_keys_project.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

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

email.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

event.rb

Use Gitlab::Git helper methods and constants as much as possible.

2015-03-10 13:39:31 +01:00

external_issue.rb

Add ExternalIssue base model to make issue referencing more robust for external issue trackers.

2015-02-11 09:21:57 -08:00

forked_project_link.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

git_hook.rb

Ability to block commits with certain filenames

2014-11-03 18:22:43 +02:00

group_milestone.rb

Remove duplicates from group milestone participants list.

2015-02-05 21:26:57 +01:00

group.rb

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

2015-03-02 16:10:12 -08:00

identity.rb

Re-annotate models

2015-03-04 14:14:00 -08:00

issue.rb

Fix method overlap for issue sorting

2015-02-05 16:49:41 -08:00

jira_issue.rb

Implement external issue tracker base model.

2015-02-06 10:30:59 -08:00

key.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

label_link.rb

Annotate models

2014-08-25 12:25:02 +03:00

label.rb

Apply default scope to labels and remove one for notes

2015-02-05 20:29:41 -08:00

ldap_group_link.rb

Prevent 500 error on ldap group links page

2014-12-08 15:58:01 +02:00

ldap_key.rb

Make SSH keys synchronisation with LDAP not delete keys added by users.

2014-07-08 12:31:11 +02:00

member.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

merge_request_diff.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

merge_request.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

milestone.rb

Fix method overlap for issue sorting

2015-02-05 16:49:41 -08:00

namespace.rb

Fix import check for case sensetive namespaces

2015-03-02 23:06:59 -08:00

note.rb

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

2015-03-11 18:41:41 -07:00

notification.rb

New feature: add 'Mention' notification level

2014-12-29 15:55:21 +02:00

personal_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_contributions.rb

Improve contribution calendar on user page

2015-01-29 17:07:44 -08:00

project_group_link.rb

Remove copyright licenses missed in 0fdab6a747.

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

project_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_team.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

project_wiki.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

project.rb

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

2015-03-11 18:41:41 -07:00

protected_branch.rb

Annotate models

2015-01-22 09:40:03 -08:00

repository.rb

This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account.

2015-03-09 21:43:54 -07:00

security_event.rb

Audit and Security event models.

2014-11-19 16:07:15 +01:00

service.rb

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

2015-03-11 18:41:41 -07:00

snippet.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

tree.rb

Factor markup? || gitlab_markdown? into new method

2014-10-04 17:56:12 +02:00

user.rb

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

2015-03-11 18:41:41 -07:00

users_star_project.rb

Annotate models

2014-08-25 12:25:02 +03:00

wiki_page.rb

Rubocop: Style/Alias enabled

2015-02-02 20:57:10 -08:00