Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ignore InlineJavaScript linter in existing script tag locations.winh-inline-script-linter | Connor Shea | 2018-02-28 | 13 | -0/+15 |
| | |||||
* | Update inline_javascript.rb to lint uses of the javascript filter as well as ↵ | Connor Shea | 2018-02-28 | 1 | -1/+7 |
| | | | | script tags. | ||||
* | Update inline_javascript.rb | Winnie Hellmann | 2018-02-28 | 1 | -2/+2 |
| | |||||
* | Forbid all inline script tags in Linter::InlineJavaScript | Winnie Hellmann | 2018-02-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'enviroments-webpack-bundle-refactor' into 'master' | Jacob Schatz | 2018-02-28 | 4 | -4/+5 |
|\ | | | | | | | | | Remove webpack bundle tag for enviroments See merge request gitlab-org/gitlab-ce!17371 | ||||
| * | Remove webpack bundle tag for enviroments | Constance Okoghenun | 2018-02-28 | 4 | -4/+5 |
|/ | |||||
* | Merge branch 'dispatcher-cleanup' into 'master' | Jacob Schatz | 2018-02-28 | 10 | -59/+27 |
|\ | | | | | | | | | Cleanup webpack config See merge request gitlab-org/gitlab-ce!17410 | ||||
| * | Merge branch 'master' into 'dispatcher-cleanup' | Jacob Schatz | 2018-02-28 | 68 | -367/+774 |
| |\ | |/ |/| | | | # Conflicts: # config/webpack.config.js | ||||
* | | Merge branch 'assignees-vue-component-missing-data-container' into 'master' | Filipa Lacerda | 2018-02-28 | 2 | -0/+6 |
|\ \ | | | | | | | | | | | | | Add Assignees vue component missing data container See merge request gitlab-org/gitlab-ce!17426 | ||||
| * | | Add Assignees vue component missing data container | George Tsiolis | 2018-02-28 | 2 | -0/+6 |
| | | | |||||
* | | | Merge branch '4826-create-empty-wiki-when-it-s-enabled' into 'master' | Stan Hu | 2018-02-28 | 3 | -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-enabled | Valery Sizov | 2018-02-28 | 1 | -0/+11 |
| | | | | |||||
| * | | | Make sure wiki exists when it's enabled | Valery Sizov | 2018-02-26 | 2 | -0/+38 |
| | | | | |||||
| * | | | update changelog | Valery Sizov | 2018-02-14 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge branch 'sh-issue-43636' into 'master' | Filipa Lacerda | 2018-02-28 | 1 | -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-43636 | Stan Hu | 2018-02-28 | 1 | -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 Schatz | 2018-02-28 | 4 | -7/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove cycle analytics bundle webpack entry point See merge request gitlab-org/gitlab-ce!17407 | ||||
| * | | | | | Remove cycle analytics bundle webpack entry point | Clement Ho | 2018-02-28 | 4 | -7/+6 |
|/ / / / / | |||||
* | | | | | Merge branch 'docs/rs-harness-executable' into 'master' | Rémy Coutable | 2018-02-28 | 1 | -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-executable | Robert Speicher | 2018-02-28 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-02-28 | 1 | -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-Jones | 2018-02-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As introduced by gitlab-org/gitlab-runner!788 | ||||
* | | | | | | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-02-28 | 1 | -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 docs | Jonathan Duck | 2018-02-28 | 1 | -2/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'move-last-ee-specific-js-files-to' into 'master' | Clement Ho | 2018-02-28 | 14 | -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-to | Rémy Coutable | 2018-02-28 | 14 | -26/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch 'patch-29' into 'master' | Rémy Coutable | 2018-02-28 | 1 | -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 Davis | 2018-02-28 | 1 | -2/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | or restart. | ||||
* | | | | | | | Merge branch 'an/lograge-fix' into 'master' | Stan Hu | 2018-02-28 | 1 | -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 issues | Andrew Newdigate | 2018-02-28 | 1 | -1/+6 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'docs-add-note-dot-com-tiers' into 'master' | 🚄 Job van der Voort 🚀 | 2018-02-28 | 1 | -12/+42 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Docs: explain feature availability in GitLab.com See merge request gitlab-org/gitlab-ce!17325 | ||||
| * | | | | | Docs: explain feature availability in GitLab.com | Marcia Ramos | 2018-02-28 | 1 | -12/+42 |
|/ / / / / | |||||
* | | | | | Merge branch 'gitaly-reenable-wiki' into 'master' | Douwe Maan | 2018-02-28 | 1 | -3/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable the remaning Wiki Gitaly-Endpoints See merge request gitlab-org/gitlab-ce!17422 | ||||
| * | | | | | Re-enable the remaning Wiki Gitaly-Endpoints | Kim Carlbäcker | 2018-02-28 | 1 | -3/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'feature/edit_pages_domain' into 'master' | Nick Thomas | 2018-02-28 | 9 | -40/+164 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PagesDomain: allow update of key/certificate Closes #29720 See merge request gitlab-org/gitlab-ce!17376 | ||||
| * | | | | | | PagesDomain: improve breadcrumbs | Rob Watson | 2018-02-28 | 3 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | PagesDomain: Add edit/update functionality | Rob Watson | 2018-02-28 | 9 | -40/+158 |
| |/ / / / / | |||||
* | | | | | | Merge branch '43643-fix-mr-label-filtering' into 'master' | Filipa Lacerda | 2018-02-28 | 4 | -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-filtering | Kushal Pandya | 2018-02-28 | 1 | -0/+43 |
| | | | | | | | |||||
| * | | | | | | Fix unnecessary spacing between labels | Kushal Pandya | 2018-02-28 | 1 | -0/+7 |
| | | | | | | | |||||
| * | | | | | | Add changelog entry | Kushal Pandya | 2018-02-28 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | Make label filter URL dynamic | Kushal Pandya | 2018-02-28 | 1 | -12/+28 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'patch-29' into 'master' | Rémy Coutable | 2018-02-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch 29 See merge request gitlab-org/gitlab-ce!17421 | ||||
| * | | | | | | Patch 29 | saberd | 2018-02-28 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'bvl-fix-qa-doorkeeper' into 'master' | Grzegorz Bizon | 2018-02-28 | 2 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify base controller for Doorkeeper See merge request gitlab-org/gitlab-ce!17416 | ||||
| * | | | | | | Specify base controller for Doorkeeperbvl-fix-qa-doorkeeper | Bob Van Landuyt | 2018-02-28 | 2 | -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ński | 2018-02-28 | 11 | -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-ip | Dylan Griffith | 2018-02-28 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Add IP Address to project runner show page (#43489) | Dylan Griffith | 2018-02-28 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Add IP Address to admin runners table (#43489) | Dylan Griffith | 2018-02-28 | 2 | -0/+3 |
| | | | | | |