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

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

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

2015-06-05 11:40:36 +02:00

..

concerns

More SystemNoteService cleanup

2015-05-26 16:30:07 -04:00

hooks

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

2015-06-05 11:40:36 +02:00

members

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

2015-05-05 10:18:27 +02: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-06-05 11:40:36 +02:00

.gitkeep

init commit

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

ability.rb

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

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

Add reference_pattern to Referable models

2015-05-26 15:48:32 -04:00

commit.rb

Surround Project.reference_pattern in parenthesis inside other patterns

2015-05-26 15:49:22 -04:00

deploy_key.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

deploy_keys_project.rb

Clean up code.

2015-04-03 12:28:47 +02:00

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

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

email.rb

Allow primary email to be set to an email that you've already added.

2015-04-30 16:17:03 +02:00

event.rb

Change text of project creation event for imports.

2015-04-06 14:51:41 +02:00

external_issue.rb

Add reference_pattern to Referable models

2015-05-26 15:48:32 -04:00

forked_project_link.rb

Use strong params for 5 more models

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

git_hook.rb

git hook refactoring

2015-03-26 13:38:26 +02:00

group_milestone.rb

Change percent_complete rescue value from 100 to 0

2015-05-26 14:57:53 -04:00

group.rb

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

2015-06-05 11:40:36 +02:00

historical_data.rb

Validate maximum active user count up until license issue date.

2015-05-21 18:49:24 +02:00

identity.rb

fix ldap identities

2015-04-11 17:56:45 +03:00

issue.rb

Surround Project.reference_pattern in parenthesis inside other patterns

2015-05-26 15:49:22 -04:00

jira_issue.rb

Implement external issue tracker base model.

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

key.rb

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

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

label_link.rb

Annotate models

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

label.rb

Support only double quotes for multi-word label references

2015-05-26 15:49:20 -04: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

license.rb

Rename issued_at to starts_at.

2015-05-21 19:50:57 +02:00

member.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

merge_request_diff.rb

Let commit model know about its project.

2015-04-24 12:29:36 +02:00

merge_request.rb

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

2015-06-05 11:40:36 +02:00

milestone.rb

Change percent_complete rescue value from 100 to 0

2015-05-26 14:57:53 -04:00

namespace.rb

Skip repo removing whem remove user or group

2015-06-03 16:16:27 +02:00

note.rb

More SystemNoteService cleanup

2015-05-26 16:30:07 -04: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_group_link.rb

Don't allow project to be shared with the group it is already in.

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

project_import_data.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

project_snippet.rb

annotate

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

project_team.rb

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

2015-04-15 19:22:57 +03:00

project_wiki.rb

Use .md as extention for wiki pages

2015-05-26 18:12:46 +02:00

project.rb

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

2015-06-05 11:40:36 +02:00

protected_branch.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

repository.rb

Remove files in web editor using rugged

2015-06-02 11:41:21 +02:00

security_event.rb

Audit and Security event models.

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

service.rb

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

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

snippet.rb

Surround Project.reference_pattern in parenthesis inside other patterns

2015-05-26 15:49:22 -04:00

subscription.rb

tests

2015-03-16 21:38:41 +02:00

tree.rb

Rename MarkdownHelper to MarkupHelper

2015-05-18 22:51:56 +02:00

user.rb

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

2015-06-05 11:40:36 +02:00

users_star_project.rb

Annotate models

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

wiki_page.rb

Fix dots in Wiki slug causing errors

2015-03-21 18:33:51 -07:00