Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre ...

Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb

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

..

concerns

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

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

network

Remove parent spacing. Fixes #7505

2014-09-06 19:51:28 +10:00

project_services

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

2014-09-15 11:24:51 +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

Annotate models

2014-08-25 12:25:02 +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

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

Annotate models

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

merge_request.rb

Annotate models

2014-08-25 12:25:02 +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

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_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 AsciiDoc support and changed to singlequotes

2014-08-22 12:33:58 +02:00

project.rb

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

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

protected_branch.rb

Use strong params for 5 more models

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

repository.rb

Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG.

2014-09-04 09:47:20 -04:00

service_hook.rb

Re-annotate models

2014-04-09 15:05:03 +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

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

Patch oauth refactoring into EE

2014-09-11 11:53:52 +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

Annotate models

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

web_hook.rb

Adding ability to configure webhook timeout via gitlab.yml

2014-09-12 11:38:14 -04:00

wiki_page.rb

A bit clearer naming for gollum_wiki.

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