Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev ...

Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml

2013-06-30 11:35:40 +03:00

..

contexts

Added few tests on Issues::BulkUpdateContext

2013-05-16 10:32:27 +00:00

controllers

Fix routing/controller specs for refactored controllers

2013-06-23 20:25:06 +03:00

factories

Annotated

2013-06-19 15:40:33 +03:00

features

Fix profile emails with new key route

2013-06-24 19:24:27 +03:00

helpers

Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist

2013-06-04 18:36:22 +03:00

javascripts

Contributors graphs feature for GitLab

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

lib

Remove teams specs

2013-06-18 22:06:20 +03:00

mailers

Fix profile emails with new key route

2013-06-24 19:24:27 +03:00

models

group add_users spec

2013-06-26 15:32:09 +03:00

observers

Fix key observer spec

2013-06-25 14:12:38 +03:00

requests/api

remove useless routing tests. Added symlink creation for project with code

2013-06-22 18:57:34 +03:00

routing

Merge branch 'master' into 6-0-dev

2013-06-30 11:35:40 +03:00

services

Show participants on issues, including mentions, and notify email to all participants

2013-06-24 11:55:44 -03:00

support

Fix spinach test

2013-06-26 19:13:29 +03:00

tasks/gitlab

Replace old hashes with new 1.9 ruby hashes (rebase)

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

workers

fixed test using repo with commits but old factory

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

factories_spec.rb

Tests to validate that invalid keys are rejected

2013-02-17 21:31:20 +02:00

factories.rb

remove useless routing tests. Added symlink creation for project with code

2013-06-22 18:57:34 +03:00

seed_project.tar.gz

Rspec test repo replaced.\nMerge Requests improved

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

spec_helper.rb

Specs refactoring to reduce test time. Disabled observers by default for specs

2013-04-10 23:28:42 +03:00