summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* migrate stl_viewer to dynamic importremove-blob-viewer-bundlesMike Greiling2018-03-014-6/+5
|
* migrate sketch_viewer to dynamic importMike Greiling2018-03-014-7/+5
|
* migrate pdf_viewer to dynamic importMike Greiling2018-03-014-7/+4
|
* migrate notebook_viewer to dynamic importMike Greiling2018-03-014-7/+4
|
* migrate balsamiq_viewer to dynamic importMike Greiling2018-03-015-8/+24
|
* Merge branch 'protected-tags-bundle-refactor' into 'master'Clement Ho2018-03-014-13/+6
|\ | | | | | | | | Removed protected_tags webpack bundle See merge request gitlab-org/gitlab-ce!17334
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵protected-tags-bundle-refactorConstance Okoghenun2018-02-27229-1066/+1420
| |\ | | | | | | | | | protected-tags-bundle-refactor
| * \ Resolved conflicts in ↵Constance Okoghenun2018-02-2698-651/+1133
| |\ \ | | | | | | | | | | | | app/assets/javascripts/pages/projects/settings/repository/show/index.js
| * | | Removed protected_tags webpack bundleConstance Okoghenun2018-02-234-14/+9
| | | |
* | | | Merge branch 'pipelines_show_refactor' into 'master'Jacob Schatz2018-02-285-6/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor pipelines show for webpack bundle tag removal See merge request gitlab-org/gitlab-ce!17127
| * \ \ \ Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactorClement Ho2018-02-28160-783/+2554
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * | | | | Remove unnecessary element checksClement Ho2018-02-271-57/+51
| | | | | |
| * | | | | Add initPipelineDetails to pipelines build pathClement Ho2018-02-274-124/+68
| | | | | |
| * | | | | Merge branch 'master' into 'pipelines_show_refactor'Clement Ho2018-02-2717-101/+82
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * \ \ \ \ \ Merge branch 'master' into 'pipelines_show_refactor'Clement Ho2018-02-27320-1713/+2549
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * | | | | | Fix failing pathsJacob Schatz2018-02-232-8/+8
| | | | | | |
| * | | | | | Fix conflictsJacob Schatz2018-02-231-1/+0
| | | | | | |
| * | | | | | Remove webpack bundleJacob Schatz2018-02-231-1/+2
| | | | | | |
| * | | | | | Refactor pipelines show for webpack bundle tag removalJacob Schatz2018-02-232-2/+70
| | | | | | |
* | | | | | | Merge branch 'enviroments-webpack-bundle-refactor' into 'master'Jacob Schatz2018-02-284-4/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Remove webpack bundle tag for enviroments See merge request gitlab-org/gitlab-ce!17371
| * | | | | | Remove webpack bundle tag for enviromentsConstance Okoghenun2018-02-284-4/+5
|/ / / / / /
* | | | | | Merge branch 'dispatcher-cleanup' into 'master'Jacob Schatz2018-02-2810-59/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup webpack config See merge request gitlab-org/gitlab-ce!17410
| * \ \ \ \ \ Merge branch 'master' into 'dispatcher-cleanup'Jacob Schatz2018-02-2868-367/+774
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
* | | | | | | Merge branch 'assignees-vue-component-missing-data-container' into 'master'Filipa Lacerda2018-02-282-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Assignees vue component missing data container See merge request gitlab-org/gitlab-ce!17426
| * | | | | | | Add Assignees vue component missing data containerGeorge Tsiolis2018-02-282-0/+6
| | | | | | | |
* | | | | | | | Merge branch '4826-create-empty-wiki-when-it-s-enabled' into 'master'Stan Hu2018-02-283-0/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure wiki exists when it's enabled See merge request gitlab-org/gitlab-ce!17117
| * | | | | | | | Add spec to prove that we don't create wiki when we update project's name4826-create-empty-wiki-when-it-s-enabledValery Sizov2018-02-281-0/+11
| | | | | | | | |
| * | | | | | | | Make sure wiki exists when it's enabledValery Sizov2018-02-262-0/+38
| | | | | | | | |
| * | | | | | | | update changelogValery Sizov2018-02-141-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-issue-43636' into 'master'Filipa Lacerda2018-02-281-17/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove pipelines mini graph spec that wasn't actually testing anything Closes #43636 See merge request gitlab-org/gitlab-ce!17428
| * | | | | | | | | Remove pipelines mini graph spec that wasn't actually testing anythingsh-issue-43636Stan Hu2018-02-281-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was also causing crashes in Chrome V64, so it's best to remove it for now. Closes #43636
* | | | | | | | | | Merge branch 'dispatcher-cycle-analytics' into 'master'Jacob Schatz2018-02-284-7/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cycle analytics bundle webpack entry point See merge request gitlab-org/gitlab-ce!17407
| * | | | | | | | | | Remove cycle analytics bundle webpack entry pointClement Ho2018-02-284-7/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/rs-harness-executable' into 'master'Rémy Coutable2018-02-281-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set security harness hook to executable after creation Closes #43709 See merge request gitlab-org/gitlab-ce!17425
| * | | | | | | | | | Set security harness hook to executable after creationdocs/rs-harness-executableRobert Speicher2018-02-281-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-281-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH} See merge request gitlab-org/gitlab-ce!16834
| * | | | | | | | | | | Add new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH}Taylor Braun-Jones2018-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As introduced by gitlab-org/gitlab-runner!788
* | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-281-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace whitespace demonstrating line-breaks in GFM docs See merge request gitlab-org/gitlab-ce!16135
| * | | | | | | | | | | | Replace whitespace demonstrating line-breaks in GFM docsJonathan Duck2018-02-281-2/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'move-last-ee-specific-js-files-to' into 'master'Clement Ho2018-02-2814-26/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the remaining EE-specific JS files to ee/ See merge request gitlab-org/gitlab-ce!17423
| * | | | | | | | | | | Move the remaining EE-specific JS files to ee/move-last-ee-specific-js-files-toRémy Coutable2018-02-2814-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-02-281-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the wording to reduce confusion about whether you need to reconfigure or restart. See merge request gitlab-org/gitlab-ce!15041
| * | | | | | | | | | | | Change the wording to reduce confusion about whether you need to reconfigure ↵Andrew Davis2018-02-281-2/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or restart.
* | | | | | | | | | | | Merge branch 'an/lograge-fix' into 'master'Stan Hu2018-02-281-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for open-ended parameter's in lograge causing elastic memory issues See merge request gitlab-org/gitlab-ce!17419
| * | | | | | | | | | | Fix for open-ended parameter's in lograge causing elastic memory issuesAndrew Newdigate2018-02-281-1/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-add-note-dot-com-tiers' into 'master'🚄 Job van der Voort 🚀2018-02-281-12/+42
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: explain feature availability in GitLab.com See merge request gitlab-org/gitlab-ce!17325
| * | | | | | | | | | Docs: explain feature availability in GitLab.comMarcia Ramos2018-02-281-12/+42
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'gitaly-reenable-wiki' into 'master'Douwe Maan2018-02-281-3/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable the remaning Wiki Gitaly-Endpoints See merge request gitlab-org/gitlab-ce!17422
| * | | | | | | | | | Re-enable the remaning Wiki Gitaly-EndpointsKim Carlbäcker2018-02-281-3/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'feature/edit_pages_domain' into 'master'Nick Thomas2018-02-289-40/+164
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PagesDomain: allow update of key/certificate Closes #29720 See merge request gitlab-org/gitlab-ce!17376