Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc ...

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

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb

2014-03-21 12:22:43 +02:00

..

controllers

Fix /:username.keys response content type

2014-03-20 19:09:14 +04:00

factories

GitHook model specs

2014-03-20 14:08:15 +02:00

features

Merge pull request #6557 from tsigo/faster-merge-request-features

2014-03-19 14:45:15 +02:00

finders

Merge pull request #6557 from tsigo/faster-merge-request-features

2014-03-19 14:45:15 +02:00

fixtures

Ability to edit comments

2013-07-01 10:48:02 +01:00

helpers

Update markdown documentation, fix wiki spec.

2014-03-17 13:23:04 +01:00

javascripts

Update jasmine gem to work with rails4

2013-12-10 16:03:24 +02:00

lib

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +02:00

mailers

Remove the author name from issue notes emails

2014-03-03 16:58:44 +01:00

models

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

2014-03-21 12:22:43 +02:00

observers

Fix specs

2014-03-14 12:53:05 +02:00

requests/api

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

2014-03-21 12:22:43 +02:00

routing

Add email aliases for users

2014-02-13 22:59:39 -06:00

services

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

2014-03-21 12:22:43 +02:00

support

TestEnv.reset_satellite_dir should run 'git clean' quietly

2014-03-13 17:25:55 -04:00

tasks/gitlab

Make backup version blocker test more robust

2014-02-28 12:11:43 +01:00

workers

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

factories_spec.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

factories.rb

Merge pull request #6557 from tsigo/faster-merge-request-features

2014-03-19 14:45:15 +02:00

seed_project.tar.gz

Speed up features/notes_on_merge_requests_spec

2014-03-19 03:57:37 -04:00

spec_helper.rb

Merge Request on forked projects

2013-07-17 22:41:30 -04:00