Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature

2015-07-14 15:40:46 +02:00

..

backend

Fix downloading of patches on public merge requests when user logged out

2015-06-23 05:34:21 -07:00

bitbucket_import

Use Projects::CreateService to create imported projects so hooks are executed.

2015-04-06 14:51:09 +02:00

diff

Fix commit comments on first line of diff not rendering in Merge Request Discussion view.

2015-02-20 10:23:34 +01:00

github_import

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

2015-07-02 17:07:02 +02:00

gitlab_import

Use Projects::CreateService to create imported projects so hooks are executed.

2015-04-06 14:51:09 +02:00

gitorious_import

Define GITORIOUS_HOST only once

2015-06-10 01:31:27 -04:00

google_code_import

Show incompatible projects in Google Code import status

2015-04-30 06:56:49 -07: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

Merge branch 'ldap-queries' into 'master'

2015-06-22 18:03:31 +00:00

markdown

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

middleware

Revert "Increase timeout for Git-over-HTTP requests."

2015-03-19 18:29:20 -07:00

o_auth

Make provider a select for identities form in admin area

2015-06-22 16:53:11 +02:00

satellite

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

2015-07-02 17:07:02 +02:00

sidekiq_middleware

Use SIGKILL by default in Sidekiq::MemoryKiller

2015-05-13 17:09:12 +02:00

access.rb

Improve description of branch protection levels.

2015-05-13 09:41:55 +02:00

app_logger.rb

Dry admin logs.

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

asciidoc.rb

Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)

2015-05-18 20:48:03 +02:00

auth.rb

Kerberos support

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

bitbucket_import.rb

Fix specs.

2015-02-24 15:07:24 +01: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

Make use of to_reference in more specs

2015-05-26 15:49:22 -04: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

contributions_calendar.rb

Fix contributions calendar empty problem under mysql

2015-04-25 20:13:52 +08:00

contributor.rb

Move lib/gitlab/contributors to its correct path

2015-04-09 15:34:55 -04:00

current_settings.rb

session_expire_seconds => session_expire_delay

2015-06-10 22:10:00 -04:00

force_push_check.rb

Fewer constants, more helpers.

2015-03-19 10:34:04 +01:00

git_access_status.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

git_access_wiki.rb

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

git_access.rb

Fix git hook validation on initial push to master branch.

2015-07-02 13:58:27 +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

Use Gitlab::Git helper methods and constants as much as possible.

2015-03-10 13:39:31 +01:00

gitorious_import.rb

Define GITORIOUS_HOST only once

2015-06-10 01:31:27 -04:00

identifier.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

import_formatter.rb

Add Bitbucket importer.

2015-02-24 15:07:24 +01: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

key_fingerprint.rb

Simplify regex.

2015-04-14 15:58:28 +02:00

logger.rb

Dry admin logs.

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

markdown.rb

Reuse HTML Pipeline object in Markdown parser

2015-06-30 13:59:27 +02:00

markup_helper.rb

Properly render plain readme

2015-07-09 11:36:09 +02:00

note_data_builder.rb

No longer needed to pass project argument to commit methods.

2015-04-24 12:29:36 +02:00

popen.rb

Style/RedundantReturn enabled

2015-03-24 18:35:57 -07:00

production_logger.rb

Dry admin logs.

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

project_search_results.rb

Revert "No need to check if repository_ref is present"

2015-06-09 15:18:15 +02:00

push_data_builder.rb

Dont set checkout sha for removed branch/tag

2015-06-15 17:54:22 +02:00

reference_extractor.rb

Fix reference extractor when there is no project.

2015-07-02 14:11:45 +02:00

regex.rb

Fix (project_)name_regex to accept non-ASCII letters and dash

2015-04-27 16:38:47 +02:00

search_results.rb

Add search issues/MR by number

2015-05-18 13:09:13 +06: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

themes.rb

Add Gitlab::Themes module; remove Gitlab::Theme

2015-06-13 17:58:16 -04:00

upgrader.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

url_builder.rb

Enforce restricted visibilities for snippets

2015-03-08 17:57:08 -06:00

user_access.rb

Cache LDAP check in Gitlab::UserAccess

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

utils.rb

add common method to force utf8 and force oauth properties to be utf8

2015-05-03 00:43:46 +03:00

version_info.rb

Fix abort gitlab:app:check

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

visibility_level.rb

Fork visibility level fix

2015-07-06 17:40:33 +03:00