Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream ...

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-14 18:23:51 +03:00

..

concerns

Add task lists to issues and merge requests

2014-10-05 22:15:27 -05:00

hooks

Add tag_push_events to project hook api

2014-10-03 10:23:32 +04:00

members

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

network

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

project_services

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

.gitkeep

init commit

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

ability.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

appearance.rb

Remove attr_accessible from EE only models

2014-07-11 14:38:56 +03:00

broadcast_message.rb

Use strong params for 5 more models

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

commit.rb

Dontr decoarate already decorated stuff

2014-10-10 17:39:29 +03: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

User model to strong params. Comment other attr_accessible to let tests run

2014-06-26 15:11:45 +03:00

event.rb

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

forked_project_link.rb

Use strong params for 5 more models

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

git_hook.rb

Remove attr_accessible from EE only models

2014-07-11 14:38:56 +03:00

group_milestone.rb

Milestone is closed only if all milestones are closed.

2014-07-14 15:25:09 +02:00

group.rb

Merge branch 'ee-7-4' into 'master'

2014-10-03 12:29:35 +00:00

issue.rb

Add task lists to issues and merge requests

2014-10-05 22:15:27 -05:00

jira_issue.rb

Add a JiraIssue class

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

key.rb

Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre

2014-09-15 11:24:51 +02:00

label_link.rb

Annotate models

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

label.rb

Annotate models

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

ldap_group_link.rb

Fix a lot of stuff related to membership refactoring

2014-10-02 17:31:36 +03: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

annotate

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

merge_request_diff.rb

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

merge_request.rb

Add task lists to issues and merge requests

2014-10-05 22:15:27 -05:00

milestone.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03:00

namespace.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

note.rb

Prevent PG::Error exception when check commit reference on commit

2014-10-06 15:07:36 +03:00

notification.rb

Improve notification settings page

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

personal_snippet.rb

annotate

2014-10-09 18:22:20 +03: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 branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

project_wiki.rb

Fix wiki

2014-09-25 13:56:23 +03:00

project.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

protected_branch.rb

Use strong params for 5 more models

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

repository.rb

Dont raise exception when wrong commit id passed

2014-10-10 15:58:11 +03:00

service.rb

annotate

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

snippet.rb

annotate

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

tree.rb

Factor markup? || gitlab_markdown? into new method

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

user.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

users_star_project.rb

Annotate models

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

wiki_page.rb

Fix wiki

2014-09-25 13:56:23 +03:00