summaryrefslogtreecommitdiff
path: root/vendor
Commit message (Collapse)AuthorAgeFilesLines
* Avoid running autodevops sast job on GitLab CEskip-sast-on-ceAlessio Caiazza2017-12-151-1/+12
|
* Merge branch 'update-dependencies-license-list' into 'master'LUKE BENNETT2017-12-131-1070/+27
|\ | | | | | | | | Updates dependencies license list See merge request gitlab-org/gitlab-ce!15905
| * Updates dependencies license listupdate-dependencies-license-listTiago Botelho2017-12-131-1070/+27
| |
* | Ran bin/rake gitlab:update_templates10-3-gitignoreLuke Bennett2017-12-1318-63/+150
|/
* Merge branch 'es-module-copy-to-clipboard' into 'master'Tim Zallmann2017-11-301-621/+0
|\ | | | | | | | | Refactor 'copy-to-clipboard.js' See merge request gitlab-org/gitlab-ce!15531
| * remove vendored clipboard library in favor of package.json entryMike Greiling2017-11-281-621/+0
| |
* | Remove serialised diff and commit columnsSean McGivern2017-11-283-0/+0
|/ | | | | | | | | | | | | | | | The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit.
* Export text utils as ES6 modulesFilipa Lacerda2017-11-131-11/+0
|
* Merge branch 'winh-update-licenses-10-2' into 'master'Oswaldo Ferreira2017-11-101-23/+205
|\ | | | | | | | | Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318
| * Update licenses for 10.2winh-update-licenses-10-2Winnie Hellmann2017-11-101-23/+205
| |
* | Update templates for 10.2winh-templates-10-2Winnie Hellmann2017-11-103-3/+3
|/
* Upgrade vendored templatesAlessio Caiazza2017-11-078-20/+107
|
* Remove Peek's original keyboard shortcut (numpad 0, keycode 96)rc/remove-peek-keyboard-shortcutRémy Coutable2017-11-031-18/+10
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"Tim Zallmann2017-11-011-1161/+0
|
* Resolve "Convert autosize.js library to be a Yarn managed library"Tim Zallmann2017-10-311-243/+0
|
* Merge branch 'update-licenses.csv' into 'master'Rémy Coutable2017-10-121-102/+52
|\ | | | | | | | | Update dependencies license list See merge request gitlab-org/gitlab-ce!14845
| * Update licensesLin Jen-Shin2017-10-121-102/+52
| | | | | | | | | | | | | | | | Followed the command from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-4-update-the-dependencies-license-list bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv
* | Update templates via:Lin Jen-Shin2017-10-1219-21/+85
|/ | | | bin/rake gitlab:update_templates
* Support new auto-deploy helm chartfix-autodevops-monitoringAlessio Caiazza2017-09-201-4/+0
| | | | | | | New auto-deploy helm chart has new names in order to support Auto Monitoring. Works with, but does not require charts/charts.gitlab.io!66 See gitlab-ce#38028
* Merge branch 'jk-update-dependencies' into 'master'Achilleas Pipinellis2017-09-081-293/+326
|\ | | | | | | | | Update dependencies license list for 10.0 See merge request !14137
| * Update dependencies license list for 10.0jk-update-dependenciesJarka Kadlecova2017-09-081-293/+326
| |
* | Update license templates for 10.0jk-update-templatesJarka Kadlecova2017-09-084-4/+55
|/
* Update rails template to include postgreszj-update-rails-templateZeger-Jan van de Weg2017-09-071-0/+0
|
* Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-073-0/+0
|\ | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932
| * Update project templates to new import versionZeger-Jan van de Weg2017-09-073-0/+0
| | | | | | | | | | | | | | If the import version changes, we need to update a few project templates to match this new version. In a seperate commit I'll update the docs to reflect this.
* | Update templates for 10.0update-templates-for-10-0Alessio Caiazza2017-09-0714-22/+572
|/
* Merge branch 'update-gitignore-9-5' into 'master'Rémy Coutable2017-09-0511-48/+58
|\ | | | | | | | | update gitignores and licenses See merge request !13423
| * 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 README Closes #36904 See merge request !13785
| * | 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
| | | | | | | | | | | | | | Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too.
* | Update rails tempalte to not contain gitlab-testZeger-Jan van de Weg2017-08-141-0/+0
|/ | | | [ci skip]
* Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-071-3634/+0
|\ | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| * 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| * | 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
|/ | | | | | | | | | | | Started implementation for the first iteration of gitlab-org/gitlab-ce#32420. This will allow users to select a template to start with, instead of an empty repository in the project just created. Internally this is basically a small extension of the ImportExport GitLab projects we already support. We just import a certain import tar archive. This commits includes the first one: Ruby on Rails. In the future more will be added.
* Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
|\ | | | | | | | | Updated vendor/licenses.csv for 9.4 See merge request !12788
| * Updated vendor/licenses.csv for 9.4James Edwards-Jones2017-07-111-260/+300
| | | | | | | | | | Autogenerated using `bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv` Required license_finder 3.0.1 for https://github.com/pivotal/LicenseFinder/pull/304
* | 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
|\ | | | | | | | | Update templates for 9.3 See merge request !12461
| * Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82Clement Ho2017-06-2631-34/+234
| | | | | | | | | | Update templates for 9.3 See merge request !12041
* | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5Clement Ho2017-06-261-49/+59
|/ | | | | Update dependencies list for 9.3 See merge request !12042
* Fix vendor/peek.js so that it can be bundled with WebpackRémy Coutable2017-06-091-2/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix linting, route, and specsRémy Coutable2017-06-091-8/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Improve the JS for the `p b` shortcut and fix its CSSRémy Coutable2017-06-091-5/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-091-4/+9
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>