Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb

2015-03-16 21:25:00 -07:00

..

concerns

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

hooks

Group level web hooks: tests

2015-03-12 20:46:10 +02:00

members

Use group_member instead of users_group or membership.

2015-03-15 13:49:41 +01:00

project_services

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

2015-03-11 18:41:41 -07:00

appearance_spec.rb

Use last appearance settings. Show last edit date

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

application_setting_spec.rb

Move restricted visibility settings to the UI

2015-03-07 13:11:08 -07:00

asana_service_spec.rb

Re-annotate models

2015-03-04 14:14:00 -08:00

broadcast_message_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

commit_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

deploy_key_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

deploy_keys_project_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

event_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

forked_project_link_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

git_hook_spec.rb

Remove mass-assigment tests

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

group_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

issue_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

jira_issue_spec.rb

Update spec per rspec 2.99 requirements.

2015-02-16 13:11:39 -08:00

key_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

label_link_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

label_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

ldap_group_link_spec.rb

Adapt frontend to LdapGroupLink with provider

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

members_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

merge_request_spec.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

milestone_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

namespace_spec.rb

Fix import check for case sensetive namespaces

2015-03-02 23:06:59 -08:00

note_spec.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

project_group_link_spec.rb

Remove mass-assigment tests

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

project_security_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

project_snippet_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

project_spec.rb

Expose avatar_url in projects API

2015-03-01 10:13:01 +09:00

project_team_spec.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

project_wiki_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

protected_branch_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

repository_spec.rb

This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account.

2015-03-09 21:43:54 -07:00

service_spec.rb

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

2015-03-11 18:41:41 -07:00

snippet_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

user_spec.rb

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

2015-03-11 18:41:41 -07:00

wiki_page_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00