Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce ...

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

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md

2014-12-26 15:05:43 +02:00

..

backend

Better message for failed pushes because of git hooks

2014-11-18 13:10:07 +02:00

diff

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

graphs

Refactor commits graph

2014-09-29 12:05:17 +03:00

kerberos

Kerberos: username as identifier

2014-12-15 18:07:03 +02:00

ldap

Prevent 500 error on ldap group links page

2014-12-08 15:58:01 +02:00

oauth

Supporting for multiple omniauth provider for the same user

2014-12-04 13:03:55 +02:00

satellite

Do a simpler rebase, show rebase check box only for users how can push code.

2014-11-28 16:48:03 +01:00

sidekiq_middleware

Fix typo

2014-12-08 13:39:18 +01:00

access.rb

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

app_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

auth.rb

Kerberos support

2014-12-15 18:06:17 +02:00

blacklist.rb

Prevent people from using ci since we plan to host ci on /ci later.

2014-09-09 10:11:07 +02:00

closing_issue_extractor.rb

Track projects in ReferenceExtractor

2014-10-03 12:30:20 -05:00

compare_result.rb

Refactor compare logic for MR. Use satellites only for forks for better performance

2014-07-29 12:11:16 +03:00

config_helper.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

contributors.rb

Use Contributor class instead of hash

2014-07-02 15:09:06 +03:00

force_push_check.rb

Reload mr code on force push too

2014-12-02 17:42:56 +02:00

git_access_status.rb

Better message for failed pushes because of git hooks

2014-11-18 13:10:07 +02:00

git_access_wiki.rb

Git hook messages: wiki access fix

2014-11-24 16:25:58 +02:00

git_access.rb

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

git_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

git_ref_validator.rb

fix system silent call

2014-11-06 13:07:42 +02:00

git.rb

Fix push not allowed to protected branch if

2014-11-03 20:37:47 +01:00

identifier.rb

Remove deprecated finders

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

inline_diff.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

issues_labels.rb

remove feature label

2014-10-31 17:22:16 -07:00

logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

markdown_helper.rb

Factor markup? || gitlab_markdown? into new method

2014-10-04 17:56:12 +02:00

markdown.rb

Remove unused variable user at lib/gitlab/markdown

2014-10-23 13:12:21 +02:00

popen.rb

Make it possible to call Gitlab::Popen.popen

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

production_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

project_search_results.rb

Fix 500 error on empty search in project

2014-09-25 15:01:02 +03:00

reference_extractor.rb

Fix JIRA issue parsing

2014-10-15 07:49:35 +02:00

regex.rb

Update default regex message to match regex.

2014-10-01 13:19:40 +02:00

search_results.rb

Fix tests

2014-08-27 15:26:35 +03:00

seeder.rb

Revert "Create dev fixture projects with fixed visibility"

2014-11-10 16:17:04 +02:00

sidekiq_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

snippet_search_results.rb

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

theme.rb

Add theme type css class

2014-12-15 13:21:26 -06:00

upgrader.rb

Return EE version check to origin

2014-09-16 10:25:18 +03:00

url_builder.rb

Use Gitlab.config instead of Settings everywhere

2014-10-15 23:01:31 +02:00

user_access.rb

Cache LDAP check in Gitlab::UserAccess

2014-08-06 18:03:01 +02:00

utils.rb

fix system silent call

2014-11-06 13:07:42 +02:00

version_info.rb

Fix abort gitlab:app:check

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

visibility_level.rb

block visibility level restriction override in controller

2014-08-28 20:33:41 +02:00