summaryrefslogtreecommitdiff
path: root/vendor
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-gitignore-9-5' into 'master'Rémy Coutable2017-09-0511-48/+58
|\
| * update gitignores and licenses - generated by bin/rake gitlab:update_templatesupdate-gitignore-9-5Simon Knox2017-08-0911-48/+58
* | Merge branch 'zj-update-templates-with-warning-header' into 'master'Stan Hu2017-08-283-0/+0
|\ \
| * | Update templates to include header in the READMEZeger-Jan van de Weg2017-08-233-0/+0
* | | Changed all font-weight values to 400 and 600Dimitrie Hoekstra2017-08-242-18/+18
|/ /
* | Add two more project templateszj-add-two-more-project-templatesZ.J. van de Weg2017-08-152-0/+0
* | Update rails tempalte to not contain gitlab-testZeger-Jan van de Weg2017-08-141-0/+0
|/
* Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-071-3634/+0
|\
| * remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-041-3634/+0
* | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-075-6422/+34
|\ \
| * | Fix issues with pdf-js dependenciesMike Greiling2017-08-074-3429/+34
| |/
| * include cropper jQuery plugin as an npm moduleuse-npm-cropperMike Greiling2017-08-011-2993/+0
* | Allow projects to be started from a templateZ.J. van de Weg2017-07-281-0/+0
|/
* Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
|\
| * Updated vendor/licenses.csv for 9.4James Edwards-Jones2017-07-111-260/+300
* | Update CI templates for 9.4James Edwards-Jones2017-07-114-20/+25
|/
* Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-061-94/+0
* Merge branch 'cherry-pick-ecd49e82' into 'master'Clement Ho2017-06-2731-34/+234
|\
| * Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82Clement Ho2017-06-2631-34/+234
* | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5Clement Ho2017-06-261-49/+59
|/
* Fix vendor/peek.js so that it can be bundled with WebpackRémy Coutable2017-06-091-2/+2
* Fix linting, route, and specsRémy Coutable2017-06-091-8/+2
* Improve the JS for the `p b` shortcut and fix its CSSRémy Coutable2017-06-091-5/+0
* Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-091-4/+9
* Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-092-31/+12
* Small adjustmentsRémy Coutable2017-06-091-258/+0
* Display queries duration in performance bar queries modalRémy Coutable2017-06-091-8/+14
* Improve UI of the performance barRémy Coutable2017-06-091-0/+10
* Fix replacement of Pygments with RougeRémy Coutable2017-06-092-6/+0
* Replace Tipsy by Bootstrap's tooltipsRémy Coutable2017-06-093-54/+10
* Tweak Peek to display SQL queriesRémy Coutable2017-06-092-30/+25
* New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-095-0/+676
* Upgrade to task_list v2Jared Deckard2017-05-231-258/+0
* Merge branch 'update-templates-for-9-2' into 'master' Timothy Andrew2017-05-0811-1/+99
|\
| * Update gitignore, dockerfile, and license templates for 9.2.update-templates-for-9-2Timothy Andrew2017-05-0811-1/+99
* | Update the vendor licenses file for 9.2.update-deps-licenses-for-9-2Timothy Andrew2017-05-081-139/+158
|/
* Submodule Dockerfile templatesZeger-Jan van de Weg2017-04-265-0/+51
* Merge branch 'notebooklab-in-repo' into 'master' Jacob Schatz2017-04-241-5733/+0
|\
| * Merge branch 'master' into notebooklab-in-repoPhil Hughes2017-04-1318-372/+566
| |\
| * | Removed notebooklab vendor filePhil Hughes2017-04-111-5887/+0
* | | Update CI templates to include 9.1 templatesZeger-Jan van de Weg2017-04-203-8/+86
* | | Correctly parse katex math in IPyhton notebooksnotebook-katex-rendering-improvementsPhil Hughes2017-04-131-15/+44
| |/ |/|
* | Merge branch 'fix-pdflab-paths' into 'master' Jacob Schatz2017-04-122-156/+171
|\ \
| * | Fix pdflab code including file pathsfix-pdflab-pathsSam Rose2017-04-112-156/+171
* | | Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templatesAdam Niedzielski2017-04-121-0/+5
* | | Merge branch 'removed-notebooklab-absolute-paths' into 'master' Jacob Schatz2017-04-111-215/+32
|\ \ \
| * | | Fixed notebooklab code including file pathsremoved-notebooklab-absolute-pathsPhil Hughes2017-04-111-215/+32
| | |/ | |/|
* | | Merge branch 'update-licenses.csv' into 'master' Robert Speicher2017-04-111-146/+322
|\ \ \ | |_|/ |/| |
| * | Update licenses.csv via:update-licenses.csvLin Jen-Shin2017-04-111-146/+322
| |/
* | Update templates via:gitlab-update_templatesLin Jen-Shin2017-04-1114-70/+68
|/