Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb

2014-10-02 13:24:59 +03: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

Serialize services properties

2014-09-10 09:56:39 -05: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

Serialize services properties

2014-09-10 09:56:39 -05:00

forked_project_link_spec.rb

Re-annotate models

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

gemnasium_service_spec.rb

Serialize services properties

2014-09-10 09:56:39 -05:00

git_hook_spec.rb

Remove mass-assigment tests

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

gitlab_ci_service_spec.rb

Serialize services properties

2014-09-10 09:56:39 -05:00

group_member_spec.rb

Replace project_access attribute with access_level in specs and API

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

group_spec.rb

Replace old references of users_project & users_group

2014-09-14 19:51:54 +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

Annotate models

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

label_spec.rb

Annotate models

2014-08-25 12:25:02 +03: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 commit '79190fe06b' into merge-79190fe06b-7.3.0-pre

2014-09-15 11:24:51 +02: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

Replace project_access attribute with access_level in specs and API

2014-09-15 11:36:50 +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_member_spec.rb

Replace old references of users_project & users_group

2014-09-14 19:51:54 +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

Remove mass assgnment specs

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

project_spec.rb

Fix MR commenting system when new commits pushed

2014-09-23 14:20:21 +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

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

Serialize services properties

2014-09-10 09:56:39 -05:00

slack_message_spec.rb

Improved Slack integration with message attachments.

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

slack_service_spec.rb

Serialize services properties

2014-09-10 09:56:39 -05:00

snippet_spec.rb

Remove mass assgnment specs

2014-06-26 23:57:55 +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

Replace old references of users_project & users_group

2014-09-14 19:51:54 +03: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