Dmitriy Zaporozhets 860a80ea57 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	app/assets/stylesheets/common.scss
	db/schema.rb

2013-08-16 14:37:51 +03:00

..

contexts

Fix filter context. Dont duplicate target project name for MR

2013-08-08 17:29:31 +03:00

controllers

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

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

factories

ProjectGroupLink model with migration and specs

2013-07-11 09:47:46 +03:00

features

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

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

fixtures

Ability to edit comments

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

helpers

Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork

2013-07-30 13:35:33 +03:00

javascripts

Contributors graphs feature for GitLab

2013-06-05 16:51:48 +08:00

lib

Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork

2013-08-08 12:12:46 +03:00

mailers

Merge Request on forked projects

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

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2013-08-16 14:37:51 +03:00

observers

Fix passign full user object instead of id to Event.create

2013-08-14 16:02:21 +03:00

requests/api

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

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

routing

Fix routing specs

2013-07-17 08:43:56 +03:00

services

Revert notification specs

2013-08-08 17:42:27 +03:00

support

Update chosen, improve ui, fix MR fork tests

2013-08-08 15:14:59 +03:00

tasks/gitlab

Fix typos

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

workers

fixed test using repo with commits but old factory

2013-04-01 19:06:47 +03:00

factories_spec.rb

Style changes from review with @randx

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

factories.rb

Style changes from review with @randx

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

seed_project.tar.gz

Rspec test repo replaced.\nMerge Requests improved

2012-03-13 23:54:49 +02:00

spec_helper.rb

Merge Request on forked projects

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