gitlab-org--gitlab-foss/spec
Dmitriy Zaporozhets 28e6e1b1ab
Merge branch '161-emails-on-push-service' of https://gitlab.com/jsternberg/gitlab-ce into jsternberg/gitlab-ce-161-emails-on-push-service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-04-14 09:27:11 +03:00
..
controllers Fix /:username.keys response content type 2014-03-20 19:09:14 +04:00
factories Re-annotate models 2014-04-09 15:05:03 +03:00
features Split feature tests out to different build job 2014-04-13 19:05:52 +02:00
finders Fix tests that dont respect project-fork relation 2014-04-03 11:47:56 +03:00
fixtures Ability to edit comments 2013-07-01 10:48:02 +01:00
helpers Determine label color based on lowercase name 2014-04-11 19:06:27 +02:00
javascripts Update jasmine gem to work with rails4 2013-12-10 16:03:24 +02:00
lib Add nickname to oauth_spec 2014-04-07 16:03:05 +03:00
mailers Fix emails on push service when a single commit is pushed 2014-04-11 11:54:02 -04:00
models Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page 2014-04-13 20:13:02 +03:00
observers Fix user_project observer test. 2014-04-03 16:35:33 +02:00
requests/api Merge pull request #6699 from criteo/api_get_open_merge_requests 2014-04-13 20:10:39 +03:00
routing Add email aliases for users 2014-02-13 22:59:39 -06:00
services Use ProjectWiki instead of GollumWiki in code 2014-04-09 14:35:58 +03:00
support Use ProjectWiki instead of GollumWiki in code 2014-04-09 14:35:58 +03: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.rb Merge pull request #6557 from tsigo/faster-merge-request-features 2014-03-19 14:45:15 +02:00
factories_spec.rb Style changes from review with @randx 2013-07-17 22:48:03 -04:00
seed_project.tar.gz Speed up features/notes_on_merge_requests_spec 2014-03-19 03:57:37 -04:00
spec_helper.rb Remove Spork 2014-03-24 08:55:27 -04:00