Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups ...

Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb

2014-08-29 14:43:20 +02:00

..

concerns

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2014-08-20 17:14:26 +02:00

network

Remove grit require

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

project_services

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00

.gitkeep

init commit

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

ability.rb

Improve labels

2014-07-30 15:15:39 +03: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

Refactor diff suppress logic and diff views

2014-07-15 18:28:21 +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

Moved some behaviour to one place

2014-07-25 22:23:42 +02: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 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

issue.rb

Migrate issue/mr labels from act_as_taggable to own labels

2014-07-29 19:19:26 +03:00

jira_issue.rb

Add a JiraIssue class

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

key.rb

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

2014-07-10 23:43:42 +03:00

label_link.rb

Label and LabelLink models for implementing own GitLab labels

2014-07-29 17:10:15 +03:00

label.rb

Improve labels validation and expose error messages

2014-08-20 12:09:19 +02:00

ldap_group_link.rb

Remove traces from ldab_cn and ldap_access

2014-08-15 12:33:05 +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

merge_request_diff.rb

Use CompareService in collecting diff when create MR

2014-07-29 12:21:03 +03:00

merge_request.rb

Migrate issue/mr labels from act_as_taggable to own labels

2014-07-29 19:19:26 +03:00

milestone.rb

Project hook, milestone, snippet strong params

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

namespace.rb

Merge pull request #7204 from cirosantilli/user-validation-msg

2014-07-02 09:57:14 +03:00

note.rb

Moved some behaviour to one place

2014-07-25 22:23:42 +02: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

Project hook, milestone, snippet strong params

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

project_snippet.rb

Re-annotate models

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

project_team.rb

Fix 404 for invited projects

2014-07-16 14:25:56 +03:00

project_wiki.rb

Added ability to serve files in wiki repository

2014-06-07 11:14:33 +02:00

project.rb

Merge branch 'merge_ce_27cf081e1b0b1df166' into 'master'

2014-08-18 10:04:30 +00:00

protected_branch.rb

Use strong params for 5 more models

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

repository.rb

Revert "history for files follows after rename"

2014-08-11 13:00:37 +03:00

service_hook.rb

Re-annotate models

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

service.rb

Project services to strong params

2014-06-26 14:49:09 +03:00

snippet.rb

Project hook, milestone, snippet strong params

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

system_hook.rb

Re-annotate models

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

tree.rb

Move calls to Gitlab::MarkdownHelper to application_helper

2014-08-11 11:59:36 +02:00

user.rb

Make LDAP sync time configurable.

2014-08-25 11:15:25 +02:00

users_group.rb

Refactor LdapResetService to reflect multiple LDAP groups

2014-08-15 19:48:34 +02:00

users_project.rb

Do not notify project owner on project creation.

2014-07-03 12:02:31 +02:00

users_star_project.rb

Add star count, view logic, more tests.

2014-07-17 22:47:16 +02:00

web_hook.rb

team member and hook strong params

2014-06-26 18:45:33 +03:00

wiki_page.rb

A bit clearer naming for gollum_wiki.

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