summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ignore InlineJavaScript linter in existing script tag locations.winh-inline-script-linterConnor Shea2018-02-2813-0/+15
|
* Update inline_javascript.rb to lint uses of the javascript filter as well as ↵Connor Shea2018-02-281-1/+7
| | | | script tags.
* Update inline_javascript.rbWinnie Hellmann2018-02-281-2/+2
|
* Forbid all inline script tags in Linter::InlineJavaScriptWinnie Hellmann2018-02-281-1/+1
|
* 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
| * | | | | | PagesDomain: improve breadcrumbsRob Watson2018-02-283-0/+6
| | | | | | |
| * | | | | | PagesDomain: Add edit/update functionalityRob Watson2018-02-289-40/+158
| |/ / / / /
* | | | | | Merge branch '43643-fix-mr-label-filtering' into 'master'Filipa Lacerda2018-02-284-12/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable filtering MR list based on clicked label in MR sidebar Closes #43643 See merge request gitlab-org/gitlab-ce!17390
| * | | | | | Labels Select Tests43643-fix-mr-label-filteringKushal Pandya2018-02-281-0/+43
| | | | | | |
| * | | | | | Fix unnecessary spacing between labelsKushal Pandya2018-02-281-0/+7
| | | | | | |
| * | | | | | Add changelog entryKushal Pandya2018-02-281-0/+5
| | | | | | |
| * | | | | | Make label filter URL dynamicKushal Pandya2018-02-281-12/+28
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-02-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch 29 See merge request gitlab-org/gitlab-ce!17421
| * | | | | | Patch 29saberd2018-02-281-1/+1
|/ / / / / /
* | | | | | Merge branch 'bvl-fix-qa-doorkeeper' into 'master'Grzegorz Bizon2018-02-282-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify base controller for Doorkeeper See merge request gitlab-org/gitlab-ce!17416
| * | | | | | Specify base controller for Doorkeeperbvl-fix-qa-doorkeeperBob Van Landuyt2018-02-282-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This will make sure the `ApplicantionController#can?` method is available for views rendering menus based on the current user's abilities.
* | | | | | Merge branch '43489-display-runner-ip' into 'master'Kamil Trzciński2018-02-2811-11/+61
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display IP Address Of Runner On Runner Page" Closes #43489 See merge request gitlab-org/gitlab-ce!17286
| * | | | | Add changelog for Display Runner IP Address (#43489)43489-display-runner-ipDylan Griffith2018-02-281-0/+5
| | | | | |
| * | | | | Add IP Address to project runner show page (#43489)Dylan Griffith2018-02-281-0/+3
| | | | | |
| * | | | | Add IP Address to admin runners table (#43489)Dylan Griffith2018-02-282-0/+3
| | | | | |