Commit c3a427f2 authored by mgandres's avatar mgandres

Remove commit sha from rails injection

parent b95daeff
...@@ -4,7 +4,6 @@ import VueApollo from 'vue-apollo'; ...@@ -4,7 +4,6 @@ import VueApollo from 'vue-apollo';
import createDefaultClient from '~/lib/graphql'; import createDefaultClient from '~/lib/graphql';
import { resetServiceWorkersPublicPath } from '../lib/utils/webpack'; import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
import { CODE_SNIPPET_SOURCE_SETTINGS } from './components/code_snippet_alert/constants'; import { CODE_SNIPPET_SOURCE_SETTINGS } from './components/code_snippet_alert/constants';
import getCommitSha from './graphql/queries/client/commit_sha.graphql';
import getCurrentBranch from './graphql/queries/client/current_branch.graphql'; import getCurrentBranch from './graphql/queries/client/current_branch.graphql';
import getLastCommitBranchQuery from './graphql/queries/client/last_commit_branch.query.graphql'; import getLastCommitBranchQuery from './graphql/queries/client/last_commit_branch.query.graphql';
import getPipelineEtag from './graphql/queries/client/pipeline_etag.graphql'; import getPipelineEtag from './graphql/queries/client/pipeline_etag.graphql';
...@@ -26,7 +25,6 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => { ...@@ -26,7 +25,6 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => {
const { const {
// Add to apollo cache as it can be updated by future queries // Add to apollo cache as it can be updated by future queries
commitSha,
initialBranchName, initialBranchName,
pipelineEtag, pipelineEtag,
// Add to provide/inject API for static values // Add to provide/inject API for static values
...@@ -69,13 +67,6 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => { ...@@ -69,13 +67,6 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => {
}, },
}); });
cache.writeQuery({
query: getCommitSha,
data: {
commitSha,
},
});
cache.writeQuery({ cache.writeQuery({
query: getPipelineEtag, query: getPipelineEtag,
data: { data: {
......
...@@ -16,7 +16,6 @@ module Ci ...@@ -16,7 +16,6 @@ module Ci
"ci-config-path": project.ci_config_path_or_default, "ci-config-path": project.ci_config_path_or_default,
"ci-examples-help-page-path" => help_page_path('ci/examples/index'), "ci-examples-help-page-path" => help_page_path('ci/examples/index'),
"ci-help-page-path" => help_page_path('ci/index'), "ci-help-page-path" => help_page_path('ci/index'),
"commit-sha" => commit_sha,
"default-branch" => project.default_branch_or_main, "default-branch" => project.default_branch_or_main,
"empty-state-illustration-path" => image_path('illustrations/empty-state/empty-dag-md.svg'), "empty-state-illustration-path" => image_path('illustrations/empty-state/empty-dag-md.svg'),
"initial-branch-name" => initial_branch, "initial-branch-name" => initial_branch,
......
...@@ -42,7 +42,6 @@ RSpec.describe Ci::PipelineEditorHelper do ...@@ -42,7 +42,6 @@ RSpec.describe Ci::PipelineEditorHelper do
"ci-config-path": project.ci_config_path_or_default, "ci-config-path": project.ci_config_path_or_default,
"ci-examples-help-page-path" => help_page_path('ci/examples/index'), "ci-examples-help-page-path" => help_page_path('ci/examples/index'),
"ci-help-page-path" => help_page_path('ci/index'), "ci-help-page-path" => help_page_path('ci/index'),
"commit-sha" => project.commit.sha,
"default-branch" => project.default_branch_or_main, "default-branch" => project.default_branch_or_main,
"empty-state-illustration-path" => 'foo', "empty-state-illustration-path" => 'foo',
"initial-branch-name" => nil, "initial-branch-name" => nil,
...@@ -69,7 +68,6 @@ RSpec.describe Ci::PipelineEditorHelper do ...@@ -69,7 +68,6 @@ RSpec.describe Ci::PipelineEditorHelper do
"ci-config-path": project.ci_config_path_or_default, "ci-config-path": project.ci_config_path_or_default,
"ci-examples-help-page-path" => help_page_path('ci/examples/index'), "ci-examples-help-page-path" => help_page_path('ci/examples/index'),
"ci-help-page-path" => help_page_path('ci/index'), "ci-help-page-path" => help_page_path('ci/index'),
"commit-sha" => '',
"default-branch" => project.default_branch_or_main, "default-branch" => project.default_branch_or_main,
"empty-state-illustration-path" => 'foo', "empty-state-illustration-path" => 'foo',
"initial-branch-name" => nil, "initial-branch-name" => nil,
...@@ -97,10 +95,7 @@ RSpec.describe Ci::PipelineEditorHelper do ...@@ -97,10 +95,7 @@ RSpec.describe Ci::PipelineEditorHelper do
end end
it 'returns correct values' do it 'returns correct values' do
latest_feature_sha = project.repository.commit('feature').sha
expect(pipeline_editor_data['initial-branch-name']).to eq('feature') expect(pipeline_editor_data['initial-branch-name']).to eq('feature')
expect(pipeline_editor_data['commit-sha']).to eq(latest_feature_sha)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment