Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb

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

..

api.rb

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

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

deploy_keys.rb

API: set gitlab-ci service for project

2013-10-29 16:39:46 +02:00

entities.rb

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

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

files.rb

Merge branch 'refactoring/context_into_services' into 'master'

2014-01-17 09:47:47 +00:00

groups.rb

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

2013-10-31 14:29:48 +02:00

helpers.rb

Make sure private_token for API is a string

2013-11-08 18:49:38 +02:00

internal.rb

Fix SSH access for LDAP users

2013-11-08 16:04:08 +01:00

issues.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

ldap.rb

LDAP groups api

2013-10-01 10:58:20 +03:00

merge_requests.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

milestones.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

namespaces.rb

fix most of warnings

2013-12-15 00:05:10 +04:00

notes.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

project_hooks.rb

ProjectHook API supports new event fields

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

project_snippets.rb

Dropped expiration date from the snippet API

2014-01-11 18:40:17 +01:00

projects.rb

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

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

repositories.rb

Remove commit_load_context.rb

2014-01-15 15:06:12 +02:00

services.rb

gitlab-ci service api: clean values instead of destroy

2013-10-29 18:13:51 +02:00

session.rb

Add LDAP support to /api/session

2013-07-16 11:28:19 +03:00

system_hooks.rb

Refactor API classes. So api classes like Gitlab::Issues become API::Issues

2013-05-14 15:33:31 +03:00

users.rb

Add website url to user

2014-01-18 19:15:10 +00:00