Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork ...

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2013-08-08 12:22:09 +03:00

..

backend

Fix typos

2013-07-29 12:47:06 +02:00

satellite

Merge branch 'master' into karlhungus-mr-on-fork

2013-08-08 12:22:09 +03:00

app_logger.rb

Application logger

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

auth.rb

Add LDAP support to /api/session

2013-07-16 11:28:19 +03:00

blacklist.rb

Add 'repository' to path blacklist, fixes #4591

2013-07-30 20:23:30 +02:00

diff_parser.rb

Move diff parsing to own class. Correctly identify note diff line

2013-08-04 20:43:49 +03:00

git_logger.rb

Application logger

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

identifier.rb

fix wrong class name

2013-04-29 09:49:25 +03:00

inline_diff.rb

Fix inline diff issue. See #3150

2013-06-12 16:43:58 +03:00

issues_labels.rb

Include default labels in issues autocomplete etc. Show colored labels on issues show page

2013-05-07 19:26:41 +03:00

logger.rb

show production.log, show only active milestone for issue filter

2012-12-19 07:14:05 +03:00

markdown.rb

Fix broken user link in email

2013-08-04 16:27:32 +03:00

popen.rb

Replace old hashes with new 1.9 ruby hashes (rebase)

2013-05-05 18:01:10 +04:00

regex.rb

Prevent xss attack over group name. Added regex validation for group and team name

2013-02-18 09:28:18 +02:00

seeder.rb

Improved seeds for development env

2012-11-13 22:11:56 +02:00

theme.rb

Classic (mars) theme will be default for 6.0

2013-06-20 11:46:54 +03:00

version_info.rb

Fix abort gitlab:app:check

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