diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-27 00:10:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-27 00:10:31 +0300 |
| commit | 277496b843d3c14cfd48286b1718b03775d83bbc (patch) | |
| tree | 2ba3b900aa2103955dc28217d83acf9263ae08aa /app/assets | |
| parent | ea413f31cf00268c71bfab1351b92f75e72c9a80 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/diffs/index.js | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/page_bundles/profile.scss | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/index.js b/app/assets/javascripts/diffs/index.js index d4ed48965aa..034dd4cf6d2 100644 --- a/app/assets/javascripts/diffs/index.js +++ b/app/assets/javascripts/diffs/index.js @@ -36,8 +36,7 @@ export default function initDiffsApp(store = notesStore) { iid: dataset.iid || '', endpointCoverage: dataset.endpointCoverage || '', endpointCodequality: dataset.endpointCodequality || '', - // This is a workaround which will be solved in: https://gitlab.com/gitlab-org/gitlab/-/issues/428758 - sastReportAvailable: Boolean(dataset.endpointSast), + sastReportAvailable: dataset.endpointSast, helpPagePath: dataset.helpPagePath, currentUser: JSON.parse(dataset.currentUserData) || {}, changesEmptyStateIllustration: dataset.changesEmptyStateIllustration, diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 9a1faf27143..bd6228175d1 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -657,7 +657,6 @@ $discord: #5865f2; $linkedin: #2867b2; $mastodon: #6364ff; $skype: #0078d7; -$twitter: #1d9bf0; /* * Award emoji diff --git a/app/assets/stylesheets/page_bundles/profile.scss b/app/assets/stylesheets/page_bundles/profile.scss index 6b31c667832..2c08db048fd 100644 --- a/app/assets/stylesheets/page_bundles/profile.scss +++ b/app/assets/stylesheets/page_bundles/profile.scss @@ -235,7 +235,7 @@ } .twitter-icon { - color: $twitter; + color: var(--gl-text-color, $gl-text-color); } .discord-icon { |