Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 ...

Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb

2014-08-15 10:25:23 +02:00

..

concerns

Fix JIRA issue reference bug

2014-06-13 18:24:30 +02:00

appearance_spec.rb

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

assembla_service_spec.rb

Proposal for split testing

2014-04-11 13:37:33 +02:00

broadcast_message_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

commit_spec.rb

Fix commit specs

2014-08-01 18:06:28 +03:00

deploy_key_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

deploy_keys_project_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

event_spec.rb

Fix project deletion and tests

2014-06-17 23:49:17 +03:00

flowdock_service_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

forked_project_link_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

gemnasium_service_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

git_hook_spec.rb

Remove mass-assigment tests

2014-07-11 16:07:20 +03:00

gitlab_ci_service_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

group_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

issue_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

jira_issue_spec.rb

Add a JiraIssue class

2014-06-13 15:40:09 +02:00

jira_service_spec.rb

Add test for jira_issue_transition_id

2014-08-12 09:54:43 +02:00

key_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

label_link_spec.rb

Label and LabelLink models for implementing own GitLab labels

2014-07-29 17:10:15 +03:00

label_spec.rb

Label and LabelLink models for implementing own GitLab labels

2014-07-29 17:10:15 +03:00

merge_request_spec.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

milestone_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

namespace_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

note_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

project_group_link_spec.rb

Remove mass-assigment tests

2014-07-11 16:07:20 +03:00

project_hook_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

project_security_spec.rb

Project has now correct owner and creator. Increased test coverage

2013-01-02 19:00:00 +02:00

project_snippet_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

project_spec.rb

Fix project and notes specs

2014-08-01 17:54:44 +03:00

project_team_spec.rb

Fix 404 for invited projects

2014-07-16 14:25:56 +03:00

project_wiki_spec.rb

Fix tests

2014-08-07 20:46:17 +03:00

protected_branch_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

service_hook_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

service_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

slack_message_spec.rb

Improved Slack integration with message attachments.

2014-04-06 11:57:48 +02:00

slack_service_spec.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

snippet_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

system_hook_spec.rb

Fix project deletion and tests

2014-06-17 23:49:17 +03:00

user_spec.rb

Merge branch 'ldap/cache_check' into 'master'

2014-08-13 13:11:04 +00:00

users_group_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

users_project_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

web_hook_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +03:00

wiki_page_spec.rb

Recreate tmp/tests on each test run

2014-07-31 19:24:53 +03:00