Dmitriy Zaporozhets d01d0c02b7 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/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb

2015-04-15 19:22:57 +03:00

..

backend

Warn when gitlab-shell version doesn't match requirement.

2015-04-06 14:02:49 +02: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 into ce-to-ee

2015-04-15 19:22:57 +03:00

gitlab_import

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

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

gitorious_import

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

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

google_code_import

Import Google Code issue assignee when mapped.

2015-04-14 23:22:14 +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

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

2015-04-15 19:22:57 +03:00

middleware

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

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

o_auth

Move lib/gitlab/oauth to lib/gitlab/o_auth

2015-04-09 14:19:24 -04:00

satellite

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

2015-04-15 19:22:57 +03:00

sidekiq_middleware

Fix typo

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

access.rb

Improve protected branches selectbox options

2015-02-03 18:12:20 -08: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

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

Refactor ClosingIssueExtractor.

2015-04-03 18:03:26 +02: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

Improve contribution calendar per day info

2015-03-22 14:52:44 -07:00

contributor.rb

Move lib/gitlab/contributors to its correct path

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

current_settings.rb

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07: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

Refactor GitAccess to use instance variables.

2015-03-24 14:11:48 +01:00

git_access.rb

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

2015-03-25 09:16:09 -07: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

identifier.rb

Remove deprecated finders

2014-01-19 23:39:56 +04: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_helper.rb

Factor markup? || gitlab_markdown? into new method

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

markdown.rb

Merge branch 'reference-access-control' into 'master'

2015-04-13 14:10:25 +00:00

note_data_builder.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08: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

Don't include system notes in issue/MR comment count.

2015-03-23 16:43:08 +01:00

push_data_builder.rb

Extend push_tag event to include tag message and last commit

2015-03-21 11:25:27 +01:00

reference_extractor.rb

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

2015-04-15 19:22:57 +03:00

regex.rb

Don't allow username to end in period.

2015-03-27 11:10:56 +01: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

Style/RedundantReturn enabled

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

upgrader.rb

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

2015-02-04 18:19:22 -08: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

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

Move application setting to separate variable.

2015-03-18 13:55:41 -07:00