Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb

2015-02-16 11:50:30 -08:00

..

backend

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08:00

diff

Rubocop: indentation fixes Yay!!!

2015-02-02 21:59:28 -08:00

github_import

GHE importer: single configuration for auth and importer

2015-02-10 15:18:28 +02:00

gitlab_import

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08: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

Fix rubocop issues

2015-02-04 18:26:41 -08:00

oauth

Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).

2015-02-13 14:44:42 +01:00

satellite

Fix rubocop issues

2015-02-04 18:26:41 -08: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

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

Allow commit messages to close several issues at once (thanks @123Haynes

2015-01-20 10:45:48 +01:00

commits_calendar.rb

Improve contribution calendar on user page

2015-01-29 17:07:44 -08: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

current_settings.rb

actually fix indentation

2015-01-25 18:38:35 +01:00

force_push_check.rb

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08: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

Git hook messages: wiki access fix

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

git_access.rb

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

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

Send checkout sha for web hooks and services

2015-01-15 10:26:33 -08:00

identifier.rb

Remove deprecated finders

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

import_formatter.rb

code folding

2015-02-05 12:50:34 -08: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

Add labels notes

2015-02-08 22:35:41 +06:00

popen.rb

Close standard input in Gitlab::Popen.popen

2015-01-05 11:51:21 +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

push_data_builder.rb

Test git builder over annotated tag

2015-01-15 11:17:47 -08:00

reference_extractor.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

regex.rb

Github Importer

2015-01-10 09:51:43 -08: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

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

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