Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02:00

..

concerns

Feature: reopen closed merge request

2014-02-28 22:43:16 +02:00

network

Remove grit require

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

project_services

added verify false on gitlab_ci integrations

2014-03-05 13:23:44 +02: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

broadcast_message.rb

Add validations to BroadcastMessage color and font

2013-12-19 20:11:01 +02:00

commit.rb

commit description in commit list

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

deploy_key.rb

Reannotate

2013-08-21 12:34:02 +03:00

deploy_keys_project.rb

Annotated

2013-06-19 15:40:33 +03:00

email.rb

Add email aliases for users

2014-02-13 22:59:39 -06:00

event.rb

Fixed 500 error on branch and tag creation via UI

2014-02-25 09:35:09 +02:00

forked_project_link.rb

Annotated

2013-06-19 15:40:33 +03:00

gollum_wiki.rb

Better submodule links.

2014-02-05 20:44:14 -06:00

group.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +02:00

issue.rb

Feature: reopen closed merge request

2014-02-28 22:43:16 +02:00

key.rb

Adapt use of Gitlab::Popen to new style

2014-02-25 12:00:33 +01:00

merge_request_diff.rb

remove dead code: broken_diffs

2014-02-27 14:58:27 +08:00

merge_request.rb

Fix error with reopened merge request not properly reloading

2014-03-12 08:54:42 +02:00

milestone.rb

Reannotate

2013-08-21 12:34:02 +03:00

namespace.rb

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

note.rb

Fix bug with cross-reference note on commit

2014-02-07 12:34:30 +02:00

notification.rb

Improve notification settings page

2014-02-17 18:06:24 +02:00

personal_snippet.rb

Reannotate

2013-08-21 12:34:02 +03:00

project_group_link.rb

Add group_access validation to ProjectGroupLink

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

project_hook.rb

Added tag_push_events to the web_hooks

2014-03-05 20:44:01 +01:00

project_snippet.rb

Reannotate

2013-08-21 12:34:02 +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.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +02:00

protected_branch.rb

replace Gitolited mixin with Gitlab::ShellAdapter

2013-03-21 21:01:14 +02:00

repository.rb

Merge pull request #6382 from jvanbaarsen/contribution-guide-link

2014-02-26 18:22:22 +02:00

service_hook.rb

Annotate web_hooks table

2013-12-04 13:37:17 +02:00

service.rb

Default values gem

2014-02-26 10:41:44 +02:00

snippet.rb

Default value for Snippet#private

2014-03-17 15:50:16 +02:00

system_hook.rb

Annotate web_hooks table

2013-12-04 13:37:17 +02: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 code-from-ce-6-7

2014-03-18 11:15:01 +02:00

users_group.rb

Reannotate

2013-08-21 12:34:02 +03:00

users_project.rb

If user is owner of project it cant be removed from this project

2013-08-27 12:47:28 +03:00

web_hook.rb

Default values for web hooks

2014-02-27 15:56:35 +02:00

wiki_page.rb

Fixed wrong last-edit time for wiki

2013-08-16 16:59:26 +03:00