6391406774
Add two more project templates
...
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.
2017-08-15 12:55:54 +02:00
9026e3e937
Update rails tempalte to not contain gitlab-test
...
[ci skip]
2017-08-14 16:45:38 +02:00
c2a8daf992
Merge branch '15664-remove-jquery-nicescroll' into 'master'
...
Resolve "Remove jQuery Nicescroll"
Closes #15664 , #30860 , and #35885
See merge request !13262
2017-08-07 19:35:45 +00:00
3b9012871d
Merge branch 'master' into zj-project-templates
...
* 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
...
2017-08-07 11:09:50 +01:00
d935278055
Fix issues with pdf-js dependencies
2017-08-07 07:47:29 +00:00
12c6abf9db
remove nicescroll from jobs page and remove the library from common.bundle.js
2017-08-04 15:52:55 -05:00
e7b5324b76
include cropper jQuery plugin as an npm module
2017-08-01 09:44:34 -05:00
1d3815f89b
Allow projects to be started from a template
...
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.
2017-07-28 11:32:46 +02:00
e8b610eee7
Merge branch 'jej/9-4-update-license-list' into 'master'
...
Updated vendor/licenses.csv for 9.4
See merge request !12788
2017-07-11 15:21:07 +00:00
f47a7ab511
Updated vendor/licenses.csv for 9.4
...
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
2017-07-11 14:50:44 +01:00
f4e76d6caf
Update CI templates for 9.4
2017-07-11 13:39:38 +01:00
18326c2080
Improve & fix the performance bar UI and behavior
2017-07-06 19:37:31 +00:00
471a40ace1
Merge branch 'cherry-pick-ecd49e82' into 'master'
...
Update templates for 9.3
See merge request !12461
2017-06-27 17:13:37 +00:00
259f36c04d
Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'
...
Update dependencies list for 9.3
See merge request !12042
2017-06-26 15:50:09 +00:00
5461623dca
Merge branch 'update-9-3-templates' into '9-3-stable'
...
Update templates for 9.3
See merge request !12041
2017-06-26 15:47:15 +00:00
8a2d536ac3
Fix vendor/peek.js so that it can be bundled with Webpack
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
b173ae6b48
Fix linting, route, and specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
af0c691706
Improve the JS for the `p b` shortcut and fix its CSS
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
54c04f53fd
Fix spec failures and add a feature flag for the performance bar
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
e859145329
Fix Rubocop offenses, improve SQL duration format and changelog entry
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
f45094a485
Small adjustments
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
651eb51ece
Display queries duration in performance bar queries modal
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
5f218eb5c3
Improve UI of the performance bar
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
d16a3cf7fc
Fix replacement of Pygments with Rouge
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
da3ad00cf1
Replace Tipsy by Bootstrap's tooltips
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
406b351137
Tweak Peek to display SQL queries
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
d39ecf1ca7
New performance bar that can be enabled with the `p b` shortcut
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09 17:21:39 +02:00
7f1e2d1ffd
Upgrade to task_list v2
2017-05-23 08:29:09 -05:00
e6b2baf216
Merge branch 'update-templates-for-9-2' into 'master'
...
Update gitignore, dockerfile, and license templates for 9.2
See merge request !11158
2017-05-08 10:46:24 +00:00
6db590a2f5
Update the vendor licenses file for 9.2.
2017-05-08 09:07:22 +00:00
a03f8f143d
Update gitignore, dockerfile, and license templates for 9.2.
2017-05-08 09:02:14 +00:00
df85a7c004
Submodule Dockerfile templates
2017-04-26 15:57:44 +00:00
640e8093d4
Merge branch 'notebooklab-in-repo' into 'master'
...
Moved NotebookLab assets into repo
See merge request !10630
2017-04-24 18:17:49 +00:00
58b4cbbc60
Update CI templates to include 9.1 templates
2017-04-20 21:30:01 +00:00
a127ad7f12
Correctly parse katex math in IPyhton notebooks
...
Previously only some of the math was getting parsed. This makes it so
that different math options are possible & correctly parsed
Also fixes an issue that meant HTML was being outputted that could cause
an XSS
Closes #30900
2017-04-13 12:57:37 +01:00
2c643a552e
Merge branch 'master' into notebooklab-in-repo
2017-04-13 08:01:55 +01:00
5c01d089b6
Merge branch 'fix-pdflab-paths' into 'master'
...
Fix pdflab code including file paths
See merge request !10632
2017-04-12 20:55:43 +00:00
7dfeaabb5a
Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates
2017-04-12 14:38:59 +02:00
5615e0d640
Merge branch 'removed-notebooklab-absolute-paths' into 'master'
...
Fixed notebooklab code including file paths
See merge request !10629
2017-04-11 20:36:00 +00:00
e3b0039405
Merge branch 'update-licenses.csv' into 'master'
...
Update licenses.csv
[ci skip]
See merge request !10620
2017-04-11 20:07:25 +00:00
f1b462e7ba
Fix pdflab code including file paths
2017-04-11 14:24:43 -04:00
310495575d
Removed notebooklab vendor file
2017-04-11 18:51:50 +01:00
e13ad82074
Fixed notebooklab code including file paths
2017-04-11 17:48:15 +01:00
e7b11d509e
Update licenses.csv via:
...
license_finder report --format=csv --save=vendor/licenses.csv
2017-04-11 12:39:06 +00:00
d41eb62e20
Update templates via:
...
rake gitlab:update_templates
2017-04-11 12:33:58 +00:00
dad30d6bbf
Use PDFLab to render PDFs in GitLab
2017-04-05 11:22:12 -04:00
c71831e80c
Added worksheets support to notebook viewer
...
Updated some Ruby code based on comments
2017-03-30 08:34:01 +01:00
47aeacd7f5
Merge branch 'ipython-notebook-viewer' into 'master'
...
iPython notebook viewer
See merge request !10017
2017-03-28 19:29:02 +00:00
0f790dbccc
Component now includes scoped styles
...
This means we no longer need the CSS, the Vue component will handle the
CSS & correctly scope it the components
2017-03-24 13:37:38 +00:00
32c6ea2d00
Updated notebooklab with latest code highlighting changes
2017-03-23 16:25:23 +00:00
Z.J. van de Weg
Phil Hughes
Filipa Lacerda
Mike Greiling
Mike Greiling
Rémy Coutable
James Edwards-Jones
Clement Ho
Jared Deckard
Timothy Andrew
Zeger-Jan van de Weg
Jacob Schatz
Adam Niedzielski
Robert Speicher
Sam Rose
Lin Jen-Shin