Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream ...

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-14 18:23:51 +03:00

..

backend

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +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

ldap

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

oauth

Remove unused methods

2014-10-14 12:09:24 +02:00

satellite

Add parenthesis to function def with arguments.

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

sidekiq_middleware

Log Sidekiq arguments

2014-07-28 16:46:36 +02:00

access.rb

Huge replace of old users_project and users_group references

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

app_logger.rb

Application logger

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

auth.rb

Remove unused methods

2014-10-14 12:09:24 +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

git_access_wiki.rb

Developers can push to wiki repo. Protected branches does not affect wiki repo any more

2014-10-07 16:05:24 +03:00

git_access.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

git_logger.rb

Application logger

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

git_ref_validator.rb

Validate branch-names and references in WebUI, API

2014-09-03 13:08:35 +02: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

Refactor label rendering and default label set generation

2014-07-29 22:19:47 +03:00

logger.rb

Add parenthesis to function def with arguments.

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

markdown_helper.rb

Factor markup? || gitlab_markdown? into new method

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

markdown.rb

Make sure relative url and asset_host are honored, specs.

2014-10-10 17:31:47 +02:00

popen.rb

Make it possible to call Gitlab::Popen.popen

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

project_search_results.rb

Fix 500 error on empty search in project

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

reference_extractor.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

regex.rb

Dont allow ? in project path

2014-07-08 18:15:23 +03:00

search_results.rb

Fix tests

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

seeder.rb

Remove set of thread variables

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

snippet_search_results.rb

Updating to persist a params snippets variable

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

theme.rb

Removed some constant allready defined warnings

2014-07-16 20:12:46 +02:00

upgrader.rb

Return EE version check to origin

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

url_builder.rb

Added an UrlBuilder for building rails named routes

2014-06-13 12:34:15 +02:00

user_access.rb

Cache LDAP check in Gitlab::UserAccess

2014-08-06 18:03:01 +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