Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis ...

Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb

2013-03-15 16:55:07 +02:00

..

concerns

Issuable consern uses StateMachine now

2013-02-18 14:43:49 +04:00

network

Refactor: Removing the duplicated code.

2013-03-07 21:10:27 +09:00

.gitkeep

init commit

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

ability.rb

Developers can merge MR if target branch is not protected

2013-02-27 20:20:31 +02:00

commit.rb

Remove unused methods

2013-01-05 13:11:15 +02:00

event.rb

Event already has author relation

2013-02-19 15:22:29 +04:00

gitlab_ci_service.rb

REpostiry, Team models

2013-01-03 21:09:18 +02:00

gollum_wiki.rb

Fix whitespace on MARKUPS constant in GollumWiki class.

2013-03-14 00:07:01 -07:00

group.rb

reannotated

2013-03-15 15:16:02 +02:00

issue.rb

reannotated

2013-03-15 15:16:02 +02:00

key.rb

remove unused code related to gitolite

2013-02-26 11:11:43 +02:00

merge_request.rb

reannotated

2013-03-15 15:16:02 +02:00

milestone.rb

reannotated

2013-03-15 15:16:02 +02:00

namespace.rb

reannotated

2013-03-15 15:16:02 +02:00

note.rb

All scopes must be in lambdas

2013-02-12 11:16:45 +04:00

project_hook.rb

Reannotated

2012-11-20 14:19:55 +02:00

project_team.rb

remove unused code related to gitolite

2013-02-26 11:11:43 +02:00

project.rb

reannotated

2013-03-15 15:16:02 +02:00

protected_branch.rb

remove update_repository calls

2013-02-04 15:24:16 +02:00

repository.rb

remove last commit widget, added repo size and owner info on project home page

2013-03-07 11:14:19 +02:00

service_hook.rb

Reannotated

2012-11-20 14:19:55 +02:00

service.rb

move activated? method to service

2013-01-03 09:52:14 +02:00

snippet.rb

All scopes must be in lambdas

2013-02-12 11:16:45 +04:00

system_hook.rb

Method moved to service

2013-02-20 15:33:03 +04:00

tree.rb

REpostiry, Team models

2013-01-03 21:09:18 +02:00

user_team_project_relationship.rb

Refactor and restyle team page for project

2013-02-18 21:10:49 +02:00

user_team_user_relationship.rb

add path and path_with_namespace to api project entity

2013-01-31 09:11:35 +02:00

user_team.rb

reannotated

2013-03-15 15:16:02 +02:00

user.rb

reannotated

2013-03-15 15:16:02 +02:00

users_project.rb

All scopes must be in lambdas

2013-02-12 11:16:45 +04:00

web_hook.rb

Fix WebHook and special symbols in credentials

2013-02-22 20:10:25 +04:00

wiki_page.rb

Replace current Wiki system with Gollum Wikis.

2013-03-09 16:39:51 -08:00

wiki.rb

Add an ordering scope to Wiki

2013-01-11 20:04:14 +01:00