diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 13:14:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 13:14:44 +0000 |
commit | e7b5a68daecd0aff0cc66666cb38c7971027a05a (patch) | |
tree | b153db785557cc807da5e623cb130a1ef384926e /app | |
parent | c8fb2e6a3942330079bde06d919cd33c6bc7600e (diff) | |
download | gitlab-ce-e7b5a68daecd0aff0cc66666cb38c7971027a05a.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/snippets/components/edit.vue | 2 | ||||
-rw-r--r-- | app/controllers/groups_controller.rb | 2 | ||||
-rw-r--r-- | app/graphql/resolvers/issue_status_counts_resolver.rb | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/javascripts/snippets/components/edit.vue b/app/assets/javascripts/snippets/components/edit.vue index 6e3a670dc38..0978fcc7f93 100644 --- a/app/assets/javascripts/snippets/components/edit.vue +++ b/app/assets/javascripts/snippets/components/edit.vue @@ -63,7 +63,7 @@ export default { return this.actions.length > 0; }, hasValidBlobs() { - return this.actions.every(x => x.filePath && x.content); + return this.actions.every(x => x.content); }, updatePrevented() { return this.snippet.title === '' || !this.hasValidBlobs || this.isUpdating; diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 2162d397da3..2d6f5d0377a 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -123,7 +123,7 @@ class GroupsController < Groups::ApplicationController if Groups::UpdateService.new(@group, current_user, group_params).execute redirect_to edit_group_path(@group, anchor: params[:update_section]), notice: "Group '#{@group.name}' was successfully updated." else - @group.path = @group.path_before_last_save || @group.path_was + @group.reset render action: "edit" end end diff --git a/app/graphql/resolvers/issue_status_counts_resolver.rb b/app/graphql/resolvers/issue_status_counts_resolver.rb index 466ca538467..0b26b9def54 100644 --- a/app/graphql/resolvers/issue_status_counts_resolver.rb +++ b/app/graphql/resolvers/issue_status_counts_resolver.rb @@ -7,7 +7,21 @@ module Resolvers type Types::IssueStatusCountsType, null: true def continue_issue_resolve(parent, finder, **args) + finder.params[parent_param(parent)] = parent if parent Gitlab::IssuablesCountForState.new(finder, parent) end + + private + + def parent_param(parent) + case parent + when Project + :project_id + when Group + :group_id + else + raise "Unexpected type of parent: #{parent.class}. Must be Project or Group" + end + end end end |