Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-08-04 14:27:41 +0300
committerJacob Schatz <jschatz1@gmail.com>2017-08-04 14:27:41 +0300
commitf9372f70ead274ea9249d0e771495e9291f41d7c (patch)
treeb870f474ab0d77e24753db17335e4c3c790f6dec /app/assets
parent074b24c65976c27b3ae777a4cec9a1437639f479 (diff)
Remove and fix permalinks.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/repo/components/repo_file_buttons.vue14
-rw-r--r--app/assets/javascripts/repo/helpers/repo_helper.js8
-rw-r--r--app/assets/stylesheets/pages/repo.scss4
3 files changed, 1 insertions, 25 deletions
diff --git a/app/assets/javascripts/repo/components/repo_file_buttons.vue b/app/assets/javascripts/repo/components/repo_file_buttons.vue
index bf4baae38fe..90e7fead9b7 100644
--- a/app/assets/javascripts/repo/components/repo_file_buttons.vue
+++ b/app/assets/javascripts/repo/components/repo_file_buttons.vue
@@ -21,18 +21,6 @@ const RepoFileButtons = {
canPreview() {
return Helper.isKindaBinary();
},
-
- rawFileURL() {
- return Helper.getRawURLFromBlobURL(this.activeFile.url);
- },
-
- blameFileURL() {
- return Helper.getBlameURLFromBlobURL(this.activeFile.url);
- },
-
- historyFileURL() {
- return Helper.getHistoryURLFromBlobURL(this.activeFile.url);
- },
},
methods: {
@@ -50,7 +38,7 @@ export default RepoFileButtons;
<div class="btn-group" role="group" aria-label="File actions">
<a :href="activeFile.blame_path" class="btn btn-default blame">Blame</a>
<a :href="activeFile.commits_path" class="btn btn-default history">History</a>
- <a href="activeFile.permalink" class="btn btn-default permalink">Permalink</a>
+ <a :href="activeFile.permalink" class="btn btn-default permalink">Permalink</a>
</div>
<a href="#" v-if="canPreview" @click.prevent="rawPreviewToggle" class="btn btn-default preview">{{activeFileLabel}}</a>
diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js
index 31fcf246c82..481d15a1cee 100644
--- a/app/assets/javascripts/repo/helpers/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -67,14 +67,6 @@ const RepoHelper = {
return okExts.indexOf(Store.activeFile.extension) > -1;
},
- getBlameURLFromBlobURL(url) {
- return url.replace('blob', 'blame');
- },
-
- getHistoryURLFromBlobURL(url) {
- return url.replace('blob', 'commits');
- },
-
setBinaryDataAsBase64(file) {
Service.getBase64Content(file.raw_path)
.then((response) => {
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 09fe11b53af..7c659529fc6 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -7,10 +7,6 @@
transition: opacity .5s;
}
-.blob-viewer {
- padding: 20px;
-}
-
.monaco-loader {
position: absolute;
top: 0;