Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 ...

Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb

2014-08-15 10:25:23 +02:00

..

backend

Increase import timeout from 2 to 4 minutes

2014-08-11 20:58:39 +03:00

ldap

Fix copy-paste errors in LDAP::Access

2014-08-08 13:04:55 +02:00

oauth

Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string

2014-07-23 20:26:16 +03:00

satellite

Fix satellite tests

2014-08-06 09:52:56 +03:00

sidekiq_middleware

Log Sidekiq arguments

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

access.rb

Improve admin user show page

2013-08-27 21:39:34 +03:00

app_logger.rb

Application logger

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

auth.rb

Remove deprecated finders

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

blacklist.rb

Add files to path blacklist.

2014-01-24 20:06:44 -06:00

closing_issue_extractor.rb

Detect closing issues in Merge Request description

2014-06-13 17:25:44 +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

contributors.rb

Use Contributor class instead of hash

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

diff_parser.rb

diff unfold

2014-08-14 15:48:14 +04:00

git_access.rb

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

2014-06-17 10:53:44 +03:00

git_logger.rb

Application logger

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

identifier.rb

Remove deprecated finders

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

inline_diff.rb

Improve commit diff

2013-09-04 18:15:42 +03:00

issues_labels.rb

Refactor label rendering and default label set generation

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

logger.rb

Replace backticks with Gitlab::Popen

2014-03-03 08:40:29 +01:00

markdown_helper.rb

Use readme we support to render if there are multiple readmes

2014-08-11 08:50:56 +02:00

markdown.rb

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

2014-06-26 13:02:08 +03:00

popen.rb

Make it possible to call Gitlab::Popen.popen

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

reference_extractor.rb

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

2014-06-17 10:53:44 +03:00

regex.rb

Dont allow ? in project path

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

seeder.rb

Remove set of thread variables

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

theme.rb

Removed some constant allready defined warnings

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

upgrader.rb

Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce

2014-03-25 10:12:59 +02: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

Removed some constant allready defined warnings

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