Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

concerns

Merge pull request #7967 from Bugagazavr/issue-actor

2014-11-05 12:10:50 +02:00

hooks

Rescue Net::OpenTimeout exception in web hook

2014-12-29 16:41:10 +02:00

members

fix specs after merge CE -> EE

2014-12-08 13:11:33 +02:00

network

Add parenthesis to function def with arguments.

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

project_services

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

.gitkeep

init commit

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

ability.rb

Factor abilities methods

2014-10-19 11:12:39 +02:00

appearance.rb

Custom header logo

2014-12-29 13:42:15 -06:00

application_setting.rb

Create ApplicationSettings if does not exist in runtime

2015-01-08 11:26:16 -08:00

audit_event.rb

Use hash instead of json.

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

broadcast_message.rb

Use strong params for 5 more models

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

commit.rb

Fixed a lot of already defined notices

2014-12-14 15:13:09 +01: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

Remove unused ex local variable from event.rb

2014-12-29 13:07:58 +01: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

Milestone is closed only if all milestones are closed.

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

group.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

identity.rb

Supporting for multiple omniauth provider for the same user

2014-12-04 13:03:55 +02: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

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

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

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

milestone.rb

Project hook, milestone, snippet strong params

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

namespace.rb

Improve fork to namespaces feature

2014-11-14 16:06:39 +02:00

note.rb

Fix random Argument error when update note

2014-12-15 16:31:23 +02: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

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

Limit to only additions and block at project team level.

2014-12-16 10:01:37 +01:00

project_wiki.rb

Fixed a lot of already defined notices

2014-12-14 15:13:09 +01:00

project.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08: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

security_event.rb

Audit and Security event models.

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

service.rb

Execute project services asynchronously

2014-12-07 12:29:37 +02:00

snippet.rb

Sanitize snippet file name in raw headers

2014-12-12 13:28:48 +02:00

tree.rb

Factor markup? || gitlab_markdown? into new method

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

user.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08: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