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

..

controllers

Split the user ssh keys by newline, not the characters "\n"

2014-02-11 19:24:23 +01:00

factories

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce

2014-01-21 18:15:49 +02:00

features

Added option to remove issue assignee on project issue page and issue edit page

2014-03-02 13:10:45 -05:00

finders

Update tests and fix Finders readme

2014-02-25 19:21:53 +02:00

fixtures

Ability to edit comments

2013-07-01 10:48:02 +01:00

helpers

Update markdown documentation, fix wiki spec.

2014-03-17 13:23:04 +01:00

javascripts

Update jasmine gem to work with rails4

2013-12-10 16:03:24 +02:00

lib

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

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

mailers

Remove the author name from issue notes emails

2014-03-03 16:58:44 +01:00

models

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

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

observers

Fix specs

2014-03-14 12:53:05 +02:00

requests/api

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

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

routing

Add email aliases for users

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

services

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

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

support

TestEnv.reset_satellite_dir should run 'git clean' quietly

2014-03-13 17:25:55 -04:00

tasks/gitlab

Make backup version blocker test more robust

2014-02-28 12:11:43 +01:00

workers

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

factories_spec.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

factories.rb

Blob and tree gfm links to anchors work.

2014-02-23 09:47:52 +01:00

seed_project.tar.gz

Blob and tree gfm links to anchors work.

2014-02-23 09:47:52 +01:00

spec_helper.rb

Merge Request on forked projects

2013-07-17 22:41:30 -04:00