Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • B bootstrap
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 263
    • Issues 263
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 114
    • Merge requests 114
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Bootstrap
  • bootstrap
  • Merge requests
  • !21591

Fix incorrect docs.min.js bundle source.

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/bardiharborow/docs-uglify-fix into v4-dev 8 years ago
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 2

Created by: bardiharborow

Errata from #21414. Fixes #21570 (closed). I misunderstood how the docs.min.js bundle worked, and included jQuery and Tether in it, which are already included in the page separately. Apparently Tether does not like being loaded twice. This was only detected when we shipped because that's the only time we compile the docs with github: true. Apologies for this mess up. :confused:

Compare
  • v4-dev (base)

and
  • latest version
    47fc3c8a
    1 commit, 2 years ago

2 files
+ 5
- 8

    Preferences

    File browser
    Compare changes
docs/as‎sets/js‎
docs.‎min.js‎ +4 -7
packag‎e.json‎ +1 -1
docs/assets/js/docs.min.js
+ 4
- 7
  • View file @ 47fc3c8a

  • Edit in single-file editor

  • Open in Web IDE

Files with large changes are collapsed by default.

package.json
+ 1
- 1
  • View file @ 47fc3c8a

  • Edit in single-file editor

  • Open in Web IDE


@@ -29,7 +29,7 @@
"scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude scss/_normalize.scss scss/*.scss",
"scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
"uglify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
"uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/*.js docs/assets/js/src/application.js",
"uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
"update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
"test": "npm run eslint && grunt test"
},
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
2
build v4
2
build v4
    Assign labels
  • Manage project labels

Milestone
v4.0.0-beta
v4.0.0-beta
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
2
2 participants
Administrator
Mark Otto
Reference: twbs/bootstrap!21591
Source branch: github/fork/bardiharborow/docs-uglify-fix

Menu

Explore Projects Groups Snippets