Timothy Andrew e805a64700 Backport changes from gitlab-org/gitlab-ee!581 to CE. ... !581 has a lot of changes that would cause merge conflicts if not properly backported to CE. This commit/MR serves as a better foundation for gitlab-org/gitlab-ee!581. = Changes = 1. Move from `has_one {merge,push}_access_level` to `has_many`, with the `length` of the association limited to `1`. This is _effectively_ a `has_one` association, but should cause less conflicts with EE, which is set to `has_many`. This has a number of related changes in the views, specs, and factories. 2. Make `gon` variable loading more consistent (with EE!581) in the `ProtectedBranchesController`. Also use `::` to prefix the `ProtectedBranches` services, because this is required in EE. 3. Extract a `ProtectedBranchAccess` concern from the two access level models. This concern only has a single `humanize` method here, but will have more methods in EE. 4. Add `form_errors` to the protected branches creation form. This is not strictly required for EE compatibility, but was an oversight nonetheless.		2016-08-16 11:05:14 +05:30
..
ci	Improve transition between states for event enqueue	2016-08-12 13:59:20 +02:00
concerns	Backport changes from gitlab-org/gitlab-ee!581 to CE.	2016-08-16 11:05:14 +05:30
hooks
members	New AccessRequests API endpoints for Group & Project	2016-08-10 19:07:05 +02:00
network	Enable Style/SpaceAfterComma Rubocop cop	2016-06-29 15:23:44 +02:00
project_services	Ability to specify branches for pivotal tracker integration	2016-08-15 11:01:41 +03:00
protected_branch	Backport changes from gitlab-org/gitlab-ee!581 to CE.	2016-08-16 11:05:14 +05:30
.gitkeep
ability.rb	Move abilities by subject class to a dedicated method	2016-08-04 16:00:31 +02:00
abuse_report.rb
appearance.rb
application_setting.rb	Default to manual input for domain_whitelist, syntax fixes and added new tests.	2016-07-18 17:53:43 -05:00
audit_event.rb
award_emoji.rb	Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.	2016-06-29 14:53:09 -06:00
blob.rb	Limit the size of SVGs when viewing them as blobs	2016-08-15 13:42:52 +02:00
broadcast_message.rb
commit.rb	Speed up Commit#repo_changes	2016-08-03 19:23:44 +02:00
commit_range.rb	Fix comment for project argument in commit_range.rb	2016-06-20 11:12:04 -07:00
commit_status.rb	Use event enqueue instead of queue	2016-08-12 13:57:58 +02:00
compare.rb	Make Compare#diffs diff_options a regular argument	2016-08-03 09:32:01 -07:00
deploy_key.rb
deploy_keys_project.rb
deployment.rb	Method names changed to #includes_commit?	2016-08-12 10:43:04 +02:00
diff_note.rb	Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible	2016-08-02 16:04:15 +02:00
discussion.rb	Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible	2016-08-02 16:04:15 +02:00
email.rb
environment.rb	Method names changed to #includes_commit?	2016-08-12 10:43:04 +02:00
event.rb	Use a more future-proof check for Note/LegacyDiffNote	2016-07-06 10:08:42 +02:00
external_issue.rb
forked_project_link.rb
generic_commit_status.rb
global_label.rb
global_milestone.rb
group.rb	Dumb-down avatar presence check in avatar_url methods	2016-07-05 10:51:11 -04:00
identity.rb
issue.rb	Further refactor and syntax fixes.	2016-08-15 17:20:57 -05:00
key.rb	Add simple identifier to public SSH keys	2016-08-02 06:56:23 +01:00
label.rb	Simplify regex for string-based multi-word label surrounded in quotes	2016-07-13 16:01:27 -03:00
label_link.rb	squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit	2016-08-01 09:57:40 +02:00
legacy_diff_note.rb	switch from diff_file_collection to diffs	2016-08-03 07:00:20 +02:00
lfs_object.rb
lfs_objects_project.rb
member.rb	Incorporate review comments	2016-07-26 16:53:39 -07:00
merge_request.rb	Merge branch 'zj-deployment-status-on-mr' into 'master'	2016-08-15 15:29:26 +00:00
merge_request_diff.rb	Enable Style/SpaceAroundEqualsInParameterDefault cop	2016-08-06 04:03:01 +02:00
milestone.rb	use has_many relationship with events	2016-07-01 15:34:10 +02:00
namespace.rb	Fix bug where destroying a namespace would not always destroy projects	2016-08-11 15:36:35 -07:00
note.rb	Added concern for a faster "cache_key" method	2016-08-08 16:49:22 +02:00
notification_setting.rb	Exclude projects pending delete from notifications	2016-07-07 20:49:17 +01:00
oauth_access_token.rb
personal_access_token.rb
personal_snippet.rb
project.rb	New AccessRequests API endpoints for Group & Project	2016-08-10 19:07:05 +02:00
project_group_link.rb
project_import_data.rb	add missing attribute to attr_encrypted so it is fully backwards-compatible	2016-06-28 09:55:19 +02:00
project_snippet.rb
project_team.rb	Fix Rename add_users_into_project and projects_ids	2016-08-04 08:55:50 -03:00
project_wiki.rb	Add method missing from EE	2016-08-12 21:56:40 -04:00
protected_branch.rb	Backport changes from gitlab-org/gitlab-ee!581 to CE.	2016-08-16 11:05:14 +05:30
release.rb
repository.rb	Update version_sorter and use new interface for faster tag sorting	2016-08-08 14:36:39 -04:00
security_event.rb
sent_notification.rb	Allow SentNotification#position to be set as string or hash	2016-07-11 12:21:05 -05:00
service.rb	Make Service.external_wikis return only active external wikis	2016-07-21 10:36:02 +02:00
snippet.rb	Merge branch 'feature/custom-highlighting' into 'master'	2016-06-28 08:42:42 +00:00
spam_log.rb	Allow SpamLog to be submitted as ham	2016-08-15 13:18:15 -05:00
subscription.rb
todo.rb	Add approval required todos	2016-07-12 19:01:09 +01:00
tree.rb
u2f_registration.rb
user.rb	Use cache for todos counter calling TodoService	2016-08-12 17:40:03 +02:00
user_agent_detail.rb	Further refactor and syntax fixes.	2016-08-15 17:20:57 -05:00
users_star_project.rb
wiki_page.rb	WikiPage should have a slug even when not persisted.	2016-07-25 09:22:47 +05:30