Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • User Account User Account
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • m4lab_tv1
  • User AccountUser Account
  • Merge requests
  • !176
An error occurred while fetching the assigned milestone of the selected merge_request.

fixing imports

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Matthias Betz requested to merge fix_critical_issues into master 10 months ago
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 1
  • Matthias Betz @betzms assigned to @betzms 10 months ago

    assigned to @betzms

  • Matthias Betz @betzms merged 10 months ago

    merged

  • Matthias Betz @betzms mentioned in commit 343d4891 10 months ago

    mentioned in commit 343d4891

  • Loading
  • Loading
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    65a5dc31
    1 commit, 10 months ago

1 file
+ 6
- 7

    Preferences

    File browser
    Compare changes
routes/account.ts
+ 6
- 7
  • View file @ 65a5dc31

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,7 +2,6 @@ import fs from 'fs'
@@ -2,7 +2,6 @@ import fs from 'fs'
import async from 'async'
import async from 'async'
import bcrypt from 'bcryptjs'
import bcrypt from 'bcryptjs'
import * as passportSaml from 'passport-saml'
import * as passportSaml from 'passport-saml'
import uuidv4 = require('uuid/v4');
import dbconn from '../config/dbconn'
import dbconn from '../config/dbconn'
import methods from '../functions/methods'
import methods from '../functions/methods'
import gitlab from '../functions/gitlab'
import gitlab from '../functions/gitlab'
@@ -436,9 +435,9 @@ export = function (app:any, config:any, passport:any, lang:string) {
@@ -436,9 +435,9 @@ export = function (app:any, config:any, passport:any, lang:string) {
if (!req.files) {
if (!req.files) {
callback(null, newLogoFile)
callback(null, newLogoFile)
} else {
} else {
let fileName = uuidv4();
// let fileName = uuidv4();
newLogoFile.mv(logoDir + fileName, function(err:any) {
newLogoFile.mv(logoDir + newLogoFile.name, function(err:any) {
newLogoFile = logoDir + fileName
newLogoFile = logoDir + newLogoFile.name
callback(err, newLogoFile)
callback(err, newLogoFile)
})
})
}
}
@@ -532,9 +531,9 @@ export = function (app:any, config:any, passport:any, lang:string) {
@@ -532,9 +531,9 @@ export = function (app:any, config:any, passport:any, lang:string) {
callback(null, newLogoFile)
callback(null, newLogoFile)
} else {
} else {
newLogoFile = req.files.logo
newLogoFile = req.files.logo
let fileName = uuidv4();
// let fileName = uuidv4();
newLogoFile.mv(logoDir + fileName, function(err:any) {
newLogoFile.mv(logoDir + newLogoFile.name, function(err:any) {
newLogoFile = logoDir + fileName
newLogoFile = logoDir + newLogoFile.name
callback(err, newLogoFile)
callback(err, newLogoFile)
})
})
}
}
Assignee
Matthias Betz's avatar
Matthias Betz
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: fix_critical_issues

Menu

Explore Projects Groups Snippets

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal