Jonathan bf1fdf92c7 XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) ...

* Cherry-picking 7b2861de3a to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master

* Renamed file to match existing scheme

(cherry picked from commit 8c22c5c6c6)

2018-02-13 15:17:29 -05:00

..

gitlab

several one-line panic, race, and logic fixes (#7766)

2017-11-03 08:25:38 -07:00

testdata

PLT-3383: image proxy support (#7991)

2018-01-22 15:32:50 -06:00

access_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

access.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

analytics_row_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

analytics_row.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

audit_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

audit.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

audits_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

audits.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

authorization.go

Role refactor (#7867)

2017-11-21 11:08:32 -08:00

authorize_test.go

Increase OAuth2 state parameter limit

2018-02-07 16:21:22 -05:00

authorize.go

Increase OAuth2 state parameter limit

2018-02-07 16:21:22 -05:00

builtin.go

add model.NewX funcs for builtin types (#7692)

2017-10-23 09:40:35 -07:00

bundle_info_test.go

Implement experimental REST API endpoints for plugins (#7279)

2017-09-01 09:00:27 -04:00

bundle_info.go

add missing license headers, test to makefile (#7711)

2017-10-25 09:33:19 -07:00

channel_count.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

channel_data.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

channel_list.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

channel_member_history_result.go

XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)

2018-02-13 15:17:29 -05:00

channel_member_history.go

XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)

2018-02-13 15:17:29 -05:00

channel_member_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

channel_member.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

channel_search_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

channel_search.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

channel_stats.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

channel_test.go

Fixing race in update channel (#7269)

2017-08-22 10:20:54 -07:00

channel_view_test.go

PLT-7404 Return viewed at times in view channel API response (#7428)

2017-09-29 08:45:59 -07:00

channel_view.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

channel.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

client4_test.go

fix client4 post sanitization (#8219)

2018-02-08 11:54:45 -05:00

client4.go

fix client4 post sanitization (#8219)

2018-02-08 11:54:45 -05:00

client.go

PLT-7810 Track if an APIv3 endpoint was used in the last day (#7744)

2017-10-31 14:36:41 -07:00

cluster_discovery_test.go

PLT-6080 moving clustering to memberlist (#6499)

2017-06-19 08:44:04 -07:00

cluster_discovery.go

Model: NewLocAppError -> NewAppError (#7450)

2017-09-15 08:32:11 -04:00

cluster_info_test.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

cluster_info.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

cluster_message_test.go

PLT-6080 moving clustering to memberlist (#6499)

2017-06-19 08:44:04 -07:00

cluster_message.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

cluster_stats_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

cluster_stats.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

command_args.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

command_response_test.go

more robust command response content-type checking (#7412)

2017-09-11 10:09:24 -05:00

command_response.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

command_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

command_webhook_test.go

PLT-1649: add response_url support for custom slash commands (#6739)

2017-08-16 08:17:57 -04:00

command_webhook.go

PLT-1649: add response_url support for custom slash commands (#6739)

2017-08-16 08:17:57 -04:00

command.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

compliance_post_test.go

Fixing issue with compliance export encoding (#7042)

2017-07-28 09:32:37 -06:00

compliance_post.go

Fixing issue with compliance export encoding (#7042)

2017-07-28 09:32:37 -06:00

compliance_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

compliance.go

ABC-173: introduce Normalize(Username|Email) (#8183)

2018-02-05 14:56:01 -05:00

config_test.go

XYZ-35: Added Support for GlobalRelay Compliance Export Format

2018-02-07 09:02:46 -05:00

config.go

XYZ-35: Added Support for GlobalRelay Compliance Export Format

2018-02-07 09:02:46 -05:00

data_retention_policy.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

emoji_search_test.go

ABC-90 Add POST /emoji/search and GET /emoji/autocomplete API endpoints (#8125)

2018-01-23 08:04:44 -08:00

emoji_search.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

emoji_test.go

APIv4 DELETE /users/{user_id}/posts/{post_id}/reactions/name (#6117)

2017-04-22 08:52:03 -04:00

emoji.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

file_info_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

file_info.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

file.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

gitlab.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

incoming_webhook_test.go

[PLT-8173] Strip the post_ prefix on incoming webhook overrides. (#8019)

2018-01-03 10:35:36 -05:00

incoming_webhook.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

initial_load_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

initial_load.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

job.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

ldap.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

license_test.go

PLT-6558: Basic data retention job scheduler/worker implementation. (#7449)

2017-09-15 09:53:48 -07:00

license.go

Eliminate utils.SetLicense calls (#8217)

2018-02-07 16:20:51 -06:00

manifest_test.go

recommit: ordered plugin settings (#7919) (#7926)

2017-11-30 18:20:29 -06:00

manifest.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

message_export.go

XYZ-35: Added Support for GlobalRelay Compliance Export Format

2018-02-07 09:02:46 -05:00

mfa_secret_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

mfa_secret.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

modeltestlib_test.go

platform/model: Don't pull in the "testing" package in normal builds (#6735)

2017-06-26 14:32:39 -04:00

oauth_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

oauth.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

outgoing_webhook_test.go

add model.NewX funcs for builtin types (#7692)

2017-10-23 09:40:35 -07:00

outgoing_webhook.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

plugin_key_value_test.go

PLT-8131 (part2) Add plugin key value store support (#7902)

2017-11-27 17:23:35 -05:00

plugin_key_value.go

Hash key for plugin store and limit id length (#7933)

2017-12-05 15:19:33 -08:00

plugins_response_test.go

PLT-8018: Bundled jira plugin (#7920)

2017-11-30 14:55:44 -06:00

plugins_response.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

post_list_test.go

PLT-7822: Fix search order for SQL search backend. (#7704)

2017-10-24 14:27:15 -04:00

post_list.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

post_test.go

PLT-3383: image proxy support (#7991)

2018-01-22 15:32:50 -06:00

post.go

fix client4 post sanitization (#8219)

2018-02-08 11:54:45 -05:00

preference_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

preference.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

preferences.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

push_notification_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

push_notification.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

push_response_test.go

PLT-6112: Add some more unit tests to the model package (#6142)

2017-04-20 09:58:54 -04:00

push_response.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

reaction_test.go

fix reaction's name validation with + sign in it (#6221)

2017-04-26 10:11:32 -04:00

reaction.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

saml_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

saml.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

scheduled_task_test.go

simplify things (#7735)

2017-10-30 11:57:24 -05:00

scheduled_task.go

PLT-6408 Framework for job server (#6404)

2017-05-18 15:05:57 -04:00

search_params_test.go

simplify things (#7735)

2017-10-30 11:57:24 -05:00

search_params.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

security_bulletin_test.go

PLT-6112: Add some more unit tests to the model package (#6142)

2017-04-20 09:58:54 -04:00

security_bulletin.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

session_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

session.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

slack_attachment.go

PLT-7824 Added support for mentions with <@userid> and <!here> (#7615) (#7737)

2017-11-17 11:17:59 -05:00

status_test.go

simplify things (#7735)

2017-10-30 11:57:24 -05:00

status.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

suggest_command_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

suggest_command.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

switch_request_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

switch_request.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

system_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

system.go

ABC-132: sign error page parameters (#8197)

2018-02-07 12:05:46 -05:00

team_member_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

team_member.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

team_search_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

team_search.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

team_stats.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

team_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

team.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

token.go

Minor fix

2017-07-06 17:28:38 -04:00

user_access_token_search_test.go

[PLT-7793] Add /users/tokens/search endpoint (#8088)

2018-01-11 16:30:55 -05:00

user_access_token_search.go

[PLT-7793] Add /users/tokens/search endpoint (#8088)

2018-01-11 16:30:55 -05:00

user_access_token_test.go

PLT-6763 Implement user access tokens and new roles (server-side) (#6972)

2017-07-31 12:59:32 -04:00

user_access_token.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

user_autocomplete.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

user_search_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

user_search.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

user_test.go

ABC-173: introduce Normalize(Username|Email) (#8183)

2018-02-05 14:56:01 -05:00

user.go

ABC-173: introduce Normalize(Username|Email) (#8183)

2018-02-05 14:56:01 -05:00

utils_test.go

Model: NewLocAppError -> NewAppError (#7450)

2017-09-15 08:32:11 -04:00

utils.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

version_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

version.go

Uncomment upgrade code for 4.7 (#8201)

2018-02-05 18:11:31 -05:00

webrtc_test.go

Revert PLT-7809 (#7793)

2017-11-06 10:23:15 -08:00

webrtc.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00

websocket_client.go

Model: NewLocAppError -> NewAppError (#7450)

2017-09-15 08:32:11 -04:00

websocket_message_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

websocket_message.go

[PLT-8494] Add delete_team websocket event (#8167)

2018-02-01 09:46:24 -05:00

websocket_request_test.go

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

websocket_request.go

unnamed return (#8170)

2018-01-30 15:23:00 -08:00