Jan-Willem van der Meer 6373c84d5f Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers ...

Conflicts:
	app/models/user.rb
	config/gitlab.yml.example
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-09 12:26:19 +02:00

..

concerns

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00

hooks

Add tag_push_events to project hook api

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

members

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00

network

Add parenthesis to function def with arguments.

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

project_services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +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

Merge pull request #7754 from Bugagazavr/hooks

2014-10-03 13:37:19 +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 'ee-7-4' into 'master'

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

issue.rb

Merge pull request #7754 from Bugagazavr/hooks

2014-10-03 13:37:19 +03: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

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

merge_request_diff.rb

Annotate models

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

merge_request.rb

Hook attributes

2014-10-02 12:58:02 +04: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

Refactoring inside refactoring. We need to go deeper

2014-09-08 21:54:52 +03: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_snippet.rb

Re-annotate models

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

project_team.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00

project_wiki.rb

Fix wiki

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

project.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into ee-7-4

2014-10-03 18:13:24 +03:00

protected_branch.rb

Use strong params for 5 more models

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

repository.rb

Merge pull request #7906 from mr-vinn/fix-graph-log

2014-09-30 12:19:05 +03:00

service.rb

Fix serialize migration. Fixes #7734

2014-09-11 18:41:03 -05:00

snippet.rb

Adding in snippet search functionality

2014-08-29 15:32:07 -04:00

tree.rb

Move calls to Gitlab::MarkdownHelper to application_helper

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

user.rb

Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers

2014-10-09 12:26:19 +02: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