Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

concerns

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

appearance_spec.rb

Use last appearance settings. Show last edit date

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

application_setting_spec.rb

Fix feature and tests

2015-01-08 13:21:00 -08:00

assembla_service_spec.rb

annotate

2014-10-09 18:22:20 +03:00

broadcast_message_spec.rb

Re-annotate models

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

buildbox_service_spec.rb

annotate

2014-10-09 18:22:20 +03:00

commit_spec.rb

Use 8chars short sha for commit in views

2014-10-10 16:30:14 +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

Merge pull request #8233 from cirosantilli/rm-new-branch-dead

2014-11-05 16:25:35 +02:00

flowdock_service_spec.rb

annotate

2014-10-09 18:22:20 +03:00

forked_project_link_spec.rb

Re-annotate models

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

gemnasium_service_spec.rb

annotate

2014-10-09 18:22:20 +03:00

git_hook_spec.rb

Remove mass-assigment tests

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

gitlab_ci_service_spec.rb

Modify tests to match new gitlab_ci_service logic

2014-11-05 16:21:35 +02:00

group_member_spec.rb

annotate

2014-10-09 18:22:20 +03:00

group_spec.rb

Replace old references of users_project & users_group

2014-09-14 19:51:54 +03:00

issue_spec.rb

Add specs for tasks

2014-10-05 22:15:36 -05: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

Annotate models

2014-08-25 12:25:02 +03:00

label_spec.rb

Annotate models

2014-08-25 12:25:02 +03:00

ldap_group_link_spec.rb

Adapt frontend to LdapGroupLink with provider

2014-10-10 21:50:54 +02:00

members_spec.rb

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

merge_request_spec.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +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

Create a failing test where commit in mr creates a mr mention note.

2014-11-05 12:18:26 +01: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_member_spec.rb

annotate

2014-10-09 18:22:20 +03:00

project_security_spec.rb

Replace project_access attribute with access_level in specs and API

2014-09-15 11:36:50 +03:00

project_snippet_spec.rb

annotate

2014-10-09 18:22:20 +03:00

project_spec.rb

Refactor merge request refresh logic on push

2014-11-11 16:49:26 +02:00

project_team_spec.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +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

pushover_service_spec.rb

Add Pushover service integration

2014-10-03 13:54:37 +02:00

repository_spec.rb

Add specs for Repository#last_commit_for_path

2014-09-29 16:45:16 +03:00

service_hook_spec.rb

Re-annotate models

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

service_spec.rb

annotate

2014-10-09 18:22:20 +03:00

slack_message_spec.rb

Merge pull request #8222 from cirosantilli/concat-with-backslash

2014-11-04 16:43:59 +01:00

slack_service_spec.rb

update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation

2014-10-23 14:47:28 -04:00

snippet_spec.rb

annotate

2014-10-09 18:22:20 +03:00

system_hook_spec.rb

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

user_spec.rb

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

web_hook_spec.rb

Remove mass assgnment specs

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

wiki_page_spec.rb

Fix branch API

2014-09-25 16:22:08 +03:00