Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee ...

Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb

2015-11-19 10:33:18 -05:00

..

ci

Merge branch 'annotate-models' into 'master'

2015-11-14 08:27:12 +00:00

concerns

Merge remote-tracking branch 'origin/master' into ce_upstream

2015-10-23 13:01:19 +02:00

hooks

Merge remote-tracking branch 'origin/master' into ce_upstream_15_10

2015-10-15 16:46:48 +03:00

members

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

project_services

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-13 12:34:34 -05:00

abuse_report_spec.rb

Streamline the "Report button"

2015-09-29 21:47:01 +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

Annotate models

2015-11-13 19:22:46 +01:00

approval_spec.rb

Rename approve->approval. Add approval count to project

2015-06-09 15:57:34 +02:00

broadcast_message_spec.rb

Fix rubocop warnings in spec/models

2015-10-03 01:48:54 -05:00

build_spec.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

commit_range_spec.rb

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

commit_spec.rb

Fix mentionable specs

2015-10-12 16:23:15 +02:00

commit_status_spec.rb

Annotate models

2015-11-13 19:22:46 +01:00

deploy_key_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

deploy_keys_project_spec.rb

Fix Style/Blocks cop violations

2015-06-22 16:00:54 -04:00

event_spec.rb

Updated rspec to rspec 3.x syntax

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

external_issue_spec.rb

Add to_reference for models that support references

2015-05-26 15:48:30 -04:00

external_wiki_service_spec.rb

Change foo.should syntax to expect(foo).to in specs

2015-06-13 18:37:30 -04:00

forked_project_link_spec.rb

Fix Style/TrailingBlankLines cop violations

2015-06-22 14:38:33 -04:00

generic_commit_status_spec.rb

Annotate models

2015-11-13 19:22:46 +01:00

git_hook_spec.rb

Remove mass-assigment tests

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

global_milestone_spec.rb

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

group_spec.rb

Annotate models

2015-11-13 19:22:46 +01:00

historical_data_spec.rb

Validate maximum active user count up until license issue date.

2015-05-21 18:49:24 +02:00

issue_spec.rb

Only accept open issues and merge requests

2015-10-16 09:59:32 +02:00

jira_issue_spec.rb

Update spec per rspec 2.99 requirements.

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

key_spec.rb

Only publish ssh key-type and key

2015-08-04 14:33:18 +02:00

label_link_spec.rb

Updated rspec to rspec 3.x syntax

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

label_spec.rb

Annotate models

2015-11-13 19:22:46 +01:00

ldap_group_link_spec.rb

RSpec 3 updates for EE

2015-07-02 12:35:49 -04:00

license_spec.rb

RSpec 3 updates for EE

2015-07-02 12:35:49 -04:00

member_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

merge_request_spec.rb

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-15 00:30:17 -05:00

milestone_spec.rb

Improve performance of sorting milestone issues

2015-10-19 11:37:14 +02:00

namespace_spec.rb

Annotate models

2015-11-13 19:22:46 +01:00

note_spec.rb

Fix mentionable specs

2015-10-12 16:23:15 +02:00

project_group_link_spec.rb

Remove mass-assigment tests

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

project_security_spec.rb

Fix Style/TrailingBlankLines cop violations

2015-06-22 14:38:33 -04:00

project_snippet_spec.rb

Updated rspec to rspec 3.x syntax

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

project_spec.rb

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-15 00:30:17 -05:00

project_team_spec.rb

Merge remote-tracking branch 'origin/master' into ce_upstream_15_10

2015-10-15 16:46:48 +03:00

project_wiki_spec.rb

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

protected_branch_spec.rb

Updated rspec to rspec 3.x syntax

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

release_spec.rb

Annotate models

2015-11-13 19:22:46 +01:00

repository_spec.rb

Refactor search by commits message

2015-11-02 16:39:24 +01:00

service_spec.rb

Merge remote-tracking branch 'origin/master' into ce_upstream_15_10

2015-10-15 16:49:01 +03:00

snippet_spec.rb

Make snippet filename optional.

2015-06-20 01:06:57 +02:00

user_spec.rb

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-15 00:30:17 -05:00

wiki_page_spec.rb

Fix rubocop warnings in spec/models

2015-10-03 01:48:54 -05:00