From 254ccd50f8d5ed28a14e5f6076eb4f99bd037641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cindy=20Pallares=20=F0=9F=A6=89?= Date: Tue, 4 Dec 2018 17:59:41 +0000 Subject: Revert "Merge branch '11-5-stable-patch-2' into '11-5-stable'" This reverts merge request !23420 --- .gitlab-ci.yml | 3 +- .../javascripts/filtered_search/dropdown_emoji.js | 11 +- .../notes/components/noteable_discussion.vue | 13 +- .../notes/components/toggle_replies_widget.vue | 2 +- .../components/deployment.vue | 8 +- .../content_viewer/viewers/image_viewer.vue | 8 + .../viewers/image_diff/swipe_viewer.vue | 18 +- .../viewers/image_diff/two_up_viewer.vue | 6 +- app/assets/stylesheets/pages/diff.scss | 15 +- .../admin/impersonation_tokens_controller.rb | 3 - app/helpers/tree_helper.rb | 4 +- app/models/project.rb | 3 + app/models/site_statistic.rb | 76 + .../admin/impersonation_tokens/index.html.haml | 5 - .../personal_access_tokens/index.html.haml | 12 +- ...sonal_access_tokens_created_container.html.haml | 14 - .../shared/_personal_access_tokens_table.html.haml | 6 + .../attr_encrypted_no_db_connection.rb | 24 +- config/initializers/sidekiq.rb | 1 - .../20181123042307_drop_site_statistics.rb | 22 - db/schema.rb | 6 +- doc/administration/pages/index.md | 12 +- doc/administration/pages/source.md | 15 +- doc/api/users.md | 5 +- doc/ci/environments.md | 34 +- doc/ci/img/view_on_env_blob.png | Bin 11889 -> 32924 bytes doc/ci/img/view_on_mr_widget.png | Bin 21969 -> 0 bytes doc/user/discussions/img/index_notes_filters.png | Bin 21284 -> 0 bytes doc/user/discussions/index.md | 20 - doc/user/permissions.md | 2 +- doc/user/project/img/issue_board.png | Bin 289964 -> 327718 bytes doc/user/project/img/issue_boards_core.png | Bin 119989 -> 61230 bytes doc/user/project/img/issue_boards_premium.png | Bin 99171 -> 72434 bytes doc/user/project/issues/img/issue_board.png | Bin 86095 -> 55931 bytes .../merge_requests/img/merge_request_pipeline.png | Bin 31046 -> 0 bytes doc/user/project/merge_requests/index.md | 28 - doc/user/project/pages/introduction.md | 40 - .../img/sharing_and_permissions_settings.png | Bin 46275 -> 50602 bytes ee/changelogs/unreleased/sh-fix-issue-54189.yml | 5 + lib/api/entities.rb | 6 +- lib/api/users.rb | 4 +- lib/gitlab/background_migration/encrypt_columns.rb | 14 - lib/gitlab/sidekiq_middleware/batch_loader.rb | 13 - lib/tasks/gitlab/site_statistics.rake | 15 + locale/ar_SA/gitlab.po | 1229 +-- locale/bg/gitlab.po | 1087 +- locale/ca_ES/gitlab.po | 1087 +- locale/cs_CZ/gitlab.po | 1103 +- locale/cy_GB/gitlab.po | 10259 ------------------- locale/da_DK/gitlab.po | 1087 +- locale/de/gitlab.po | 6473 +++++------- locale/el_GR/gitlab.po | 9995 ------------------ locale/eo/gitlab.po | 1087 +- locale/es/gitlab.po | 1095 +- locale/et_EE/gitlab.po | 1087 +- locale/fil_PH/gitlab.po | 1087 +- locale/fr/gitlab.po | 1175 +-- locale/gl_ES/gitlab.po | 1087 +- locale/he_IL/gitlab.po | 1103 +- locale/hu_HU/gitlab.po | 9995 ------------------ locale/id_ID/gitlab.po | 1082 +- locale/it/gitlab.po | 1095 +- locale/ja/gitlab.po | 1374 +-- locale/ko/gitlab.po | 2940 ++---- locale/mn_MN/gitlab.po | 1089 +- locale/nb_NO/gitlab.po | 1089 +- locale/nl_NL/gitlab.po | 1089 +- locale/pl_PL/gitlab.po | 1103 +- locale/pt_BR/gitlab.po | 1301 +-- locale/pt_PT/gitlab.po | 9995 ------------------ locale/ro_RO/gitlab.po | 1092 +- locale/ru/gitlab.po | 1123 +- locale/sk_SK/gitlab.po | 10127 ------------------ locale/sq_AL/gitlab.po | 1087 +- locale/sr_CS/gitlab.po | 10061 ------------------ locale/sr_SP/gitlab.po | 10061 ------------------ locale/tr_TR/gitlab.po | 1087 +- locale/uk/gitlab.po | 1559 +-- locale/zh_CN/gitlab.po | 1214 +-- locale/zh_HK/gitlab.po | 1078 +- locale/zh_TW/gitlab.po | 1438 +-- qa/qa/page/profile/personal_access_tokens.rb | 2 +- qa/qa/resource/user.rb | 11 - qa/qa/runtime/env.rb | 16 - .../1_manage/project/add_project_member_spec.rb | 2 +- scripts/trigger-build | 1 - .../personal_access_tokens_controller_spec.rb | 6 - spec/factories/site_statistics.rb | 6 + .../admin/admin_users_impersonation_tokens_spec.rb | 5 - .../issues/filtered_search/dropdown_emoji_spec.rb | 2 +- .../profiles/personal_access_tokens_spec.rb | 3 - spec/helpers/tree_helper_spec.rb | 28 - .../attr_encrypted_no_db_connection_spec.rb | 30 - .../notes/components/noteable_discussion_spec.js | 44 - .../background_migration/encrypt_columns_spec.rb | 25 - spec/models/project_spec.rb | 16 + spec/models/site_statistic_spec.rb | 81 + spec/requests/api/users_spec.rb | 4 +- spec/tasks/gitlab/site_statistics_rake_spec.rb | 23 + 99 files changed, 9314 insertions(+), 103584 deletions(-) create mode 100644 app/models/site_statistic.rb delete mode 100644 app/views/shared/_personal_access_tokens_created_container.html.haml delete mode 100644 db/post_migrate/20181123042307_drop_site_statistics.rb delete mode 100644 doc/ci/img/view_on_mr_widget.png delete mode 100644 doc/user/discussions/img/index_notes_filters.png delete mode 100644 doc/user/project/merge_requests/img/merge_request_pipeline.png create mode 100644 ee/changelogs/unreleased/sh-fix-issue-54189.yml delete mode 100644 lib/gitlab/sidekiq_middleware/batch_loader.rb create mode 100644 lib/tasks/gitlab/site_statistics.rake delete mode 100644 locale/cy_GB/gitlab.po delete mode 100644 locale/el_GR/gitlab.po delete mode 100644 locale/hu_HU/gitlab.po delete mode 100644 locale/pt_PT/gitlab.po delete mode 100644 locale/sk_SK/gitlab.po delete mode 100644 locale/sr_CS/gitlab.po delete mode 100644 locale/sr_SP/gitlab.po create mode 100644 spec/factories/site_statistics.rb delete mode 100644 spec/initializers/attr_encrypted_no_db_connection_spec.rb create mode 100644 spec/models/site_statistic_spec.rb create mode 100644 spec/tasks/gitlab/site_statistics_rake_spec.rb diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 558ca8b6e8f..0e7a67f9cc1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -318,8 +318,7 @@ review-docs-cleanup: cloud-native-image: image: ruby:2.4-alpine before_script: [] - dependencies: [] - stage: post-test + stage: test allow_failure: true variables: GIT_DEPTH: "1" diff --git a/app/assets/javascripts/filtered_search/dropdown_emoji.js b/app/assets/javascripts/filtered_search/dropdown_emoji.js index d9a4d06b549..af7936a92fb 100644 --- a/app/assets/javascripts/filtered_search/dropdown_emoji.js +++ b/app/assets/javascripts/filtered_search/dropdown_emoji.js @@ -69,13 +69,10 @@ export default class DropdownEmoji extends FilteredSearchDropdown { // Replace empty gl-emoji tag to real content const dropdownItems = [...this.dropdown.querySelectorAll('.filter-dropdown-item')]; dropdownItems.forEach(dropdownItem => { - const valueElement = dropdownItem.querySelector('.js-data-value'); - if (valueElement !== null) { - const name = valueElement.innerText; - const emojiTag = this.glEmojiTag(name); - const emojiElement = dropdownItem.querySelector('gl-emoji'); - emojiElement.outerHTML = emojiTag; - } + const name = dropdownItem.querySelector('.js-data-value').innerText; + const emojiTag = this.glEmojiTag(name); + const emojiElement = dropdownItem.querySelector('gl-emoji'); + emojiElement.outerHTML = emojiTag; }); } diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index cdcec0862de..c1dfa036678 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -69,7 +69,7 @@ export default { isReplying: false, isResolving: false, resolveAsThread: true, - isRepliesToggledByUser: false, + isRepliesCollapsed: (!this.discussion.diff_discussion && this.discussion.resolved) || false, }; }, computed: { @@ -189,15 +189,6 @@ export default { return isExpanded || this.alwaysExpanded || isResolvedNonDiffDiscussion; }, - isRepliesCollapsed() { - const { discussion, isRepliesToggledByUser } = this; - const { resolved, notes } = discussion; - const hasReplies = notes.length > 1; - - return ( - (!discussion.diff_discussion && resolved && hasReplies && !isRepliesToggledByUser) || false - ); - }, }, watch: { isReplying() { @@ -242,7 +233,7 @@ export default { this.toggleDiscussion({ discussionId: this.discussion.id }); }, toggleReplies() { - this.isRepliesToggledByUser = !this.isRepliesToggledByUser; + this.isRepliesCollapsed = !this.isRepliesCollapsed; }, showReplyForm() { this.isReplying = true; diff --git a/app/assets/javascripts/notes/components/toggle_replies_widget.vue b/app/assets/javascripts/notes/components/toggle_replies_widget.vue index 0af57dbb00a..78ecbbb9247 100644 --- a/app/assets/javascripts/notes/components/toggle_replies_widget.vue +++ b/app/assets/javascripts/notes/components/toggle_replies_widget.vue @@ -44,7 +44,7 @@ export default { 0; }, @@ -82,6 +89,7 @@ export default {
+ class="swipe-wrap"> diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue index aafa88f4ff1..9806d65e940 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue @@ -19,18 +19,18 @@ export default {