Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' ...

Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb

2014-05-21 13:10:37 +02:00

..

concerns

Remove author_id_of_changes from app

2014-03-25 14:01:52 +02:00

network

Remove grit require

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

project_services

Add help section for services

2014-05-15 11:28:01 +03:00

.gitkeep

init commit

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

ability.rb

Fixes a bug with group member administration

2014-03-10 22:56:26 -04:00

appearance.rb

Appearance model for custom signin page

2014-04-14 22:14:50 +03:00

broadcast_message.rb

Re-annotate models

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

commit.rb

commit description in commit list

2014-02-25 18:23:23 +04:00

deploy_key.rb

Re-annotate models

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

deploy_keys_project.rb

Re-annotate models

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

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

2014-03-27 09:15:25 +13:00

email.rb

Re-annotate models

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

event.rb

Re-annotate models

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

forked_project_link.rb

Re-annotate models

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

git_hook.rb

Decline web editor action if commit message does not match one in project git hooks settings

2014-04-15 15:20:52 +03:00

group.rb

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

2014-04-10 13:34:56 +03:00

issue.rb

Re-annotate models

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

key.rb

Re-annotate models

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

merge_request_diff.rb

Add CompareAction class for collecting commits and diffs using satellites

2014-05-07 16:14:24 +03:00

merge_request.rb

Merge pull request #6778 from dblessing/feature/mr_labels

2014-05-13 14:43:46 +03:00

milestone.rb

Migrate invalid rows with missing iids or duplicates

2014-04-24 19:39:33 +02:00

namespace.rb

Re-annotate models

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

note.rb

Editing preview

2014-04-15 19:02:02 +04: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

Add group_access validation to ProjectGroupLink

2013-10-03 10:04:07 +03:00

project_hook.rb

Re-annotate models

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

2014-02-11 10:15:13 +02:00

project_wiki.rb

Allow nested files in wiki.

2014-04-28 16:22:31 +02:00

project.rb

Merge remote-tracking branch 'ce/master'

2014-05-21 13:10:37 +02:00

protected_branch.rb

Re-annotate models

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

repository.rb

Remove archives older than 2 hours.

2014-04-09 15:09:11 +02:00

service_hook.rb

Re-annotate models

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

service.rb

Add help section for services

2014-05-15 11:28:01 +03:00

snippet.rb

Re-annotate models

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

system_hook.rb

Re-annotate models

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

tree.rb

Use new gitlab_git gem. It makes CONTRIBUTING.md work

2014-02-27 15:52:14 +02:00

user.rb

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

2014-04-10 13:34:56 +03:00

users_group.rb

Re-annotate models

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

users_project.rb

Re-annotate models

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

web_hook.rb

Re-annotate models

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

wiki_page.rb

A bit clearer naming for gollum_wiki.

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