Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee ...

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

backend

Fix gitlab-ci integration

2014-03-21 23:05:28 +02:00

ldap

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

2014-06-17 10:53:44 +03:00

oauth

Strip apostrophe from email generated usernames.

2014-06-11 17:06:28 +02:00

satellite

Use same 30 seconds satellite timeout for all actions

2014-06-11 23:37:21 +03:00

access.rb

Improve admin user show page

2013-08-27 21:39:34 +03:00

app_logger.rb

Application logger

2012-09-11 23:24:53 +03:00

auth.rb

Remove deprecated finders

2014-01-19 23:39:56 +04:00

blacklist.rb

Add files to path blacklist.

2014-01-24 20:06:44 -06:00

closing_issue_extractor.rb

Detect closing issues in Merge Request description

2014-06-13 17:25:44 +02:00

diff_parser.rb

Editing preview

2014-04-15 19:02:02 +04:00

git_access.rb

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

2014-06-17 10:53:44 +03:00

git_logger.rb

Application logger

2012-09-11 23:24:53 +03:00

identifier.rb

Remove deprecated finders

2014-01-19 23:39:56 +04:00

inline_diff.rb

Improve commit diff

2013-09-04 18:15:42 +03:00

issues_labels.rb

Include default labels in issues autocomplete etc. Show colored labels on issues show page

2013-05-07 19:26:41 +03:00

logger.rb

Replace backticks with Gitlab::Popen

2014-03-03 08:40:29 +01:00

markdown.rb

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

2014-06-17 10:53:44 +03:00

popen.rb

Make it possible to call Gitlab::Popen.popen

2014-02-25 11:58:58 +01:00

reference_extractor.rb

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

2014-06-17 10:53:44 +03:00

regex.rb

Allow underscore as the first char for project names.

2014-03-06 14:08:40 +01:00

seeder.rb

Remove set of thread variables

2014-06-10 17:51:49 +03:00

theme.rb

Respect default theme settings. Fixed sign-in button on publica page

2014-01-10 13:58:52 +02:00

upgrader.rb

Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce

2014-03-25 10:12:59 +02:00

user_access.rb

Move user access check to Gitlab::UserAccess

2014-05-15 10:22:59 +02:00

version_info.rb

Fix abort gitlab:app:check

2013-06-06 10:10:51 +09:00

visibility_level.rb

Adding authenticated public mode (internal).

2013-11-26 22:22:07 -06:00