Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 ...

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

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

2013-11-29 10:01:43 +02:00

..

contexts

Allow searching by namespace name, include public projects

2013-10-24 11:23:26 -04:00

controllers

Don't show users password change page if ldap users

2013-09-17 22:38:08 -04:00

factories

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

features

Fix rspec test after bdd3513f03

2013-10-20 18:29:11 +03:00

fixtures

Ability to edit comments

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

helpers

Preselect the current issue tracker with selected="selected"

2013-11-01 15:33:47 +01:00

javascripts

Make rake gitlab:test works

2013-09-29 23:36:44 +03:00

lib

Fix tests

2013-10-31 16:12:45 +02:00

mailers

Merge pull request #5571 from bke-drewb/email

2013-11-08 23:59:27 -08:00

models

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

observers

Updated missed styles

2013-10-10 09:17:30 -04:00

requests/api

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

routing

Expand refs constraints to include valid characters

2013-10-24 16:31:15 +11:00

services

Include project_id in webhook payload.

2013-10-14 12:03:25 +02:00

support

Fix tests

2013-11-20 19:27:49 +02:00

tasks/gitlab

Fix typos

2013-07-29 12:47:06 +02:00

workers

fixed test using repo with commits but old factory

2013-04-01 19:06:47 +03:00

factories_spec.rb

Style changes from review with @randx

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

factories.rb

Clear state in test satellite dir.

2013-11-12 15:11:46 +01:00

seed_project.tar.gz

Test if markdown is rendered properly.

2013-10-11 13:44:00 +02:00

spec_helper.rb

Merge Request on forked projects

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