summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix spec/migrations/update_upload_paths_to_system_spec.rb to use the ↵rc/fix-update_upload_paths_to_system_specRémy Coutable2018-01-181-26/+32
| | | | | | :migration metadata Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-188-10/+160
|\ | | | | | | | | | | | | Add modal for stopping jobs in admin area Closes #41305 See merge request gitlab-org/gitlab-ce!16283
| * Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-188-10/+160
| |
* | Merge branch 'jramsay-improved-convdev-image-docs' into 'master'Sean McGivern2018-01-181-0/+0
|\ \ | | | | | | | | | | | | Update ConvDev Index docs w better screenshot See merge request gitlab-org/gitlab-ce!16533
| * | Update ConvDev Index docs w better screenshotjramsay-improved-convdev-image-docsJames Ramsay2018-01-171-0/+0
| | |
* | | Merge branch 'add-opensuse-to-supported-list' into 'master'Marin Jankovski2018-01-181-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Add openSUSE to the supported Unix OS list See merge request gitlab-org/gitlab-ce!16544
| * | | Add openSUSE to the supported Unix OS listBalasankar C2018-01-181-0/+1
|/ / /
* | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-01-181-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove a broken link in the docs See merge request gitlab-org/gitlab-ce!16532
| * | | Remove the second link, blog URL has changed hands and I can't find any new ↵Connor Shea2018-01-171-1/+0
| |/ / | | | | | | | | | blog by this guy.
* | | Merge branch 'rc/port-from-ee-4119' into 'master'Sean McGivern2018-01-181-26/+39
|\ \ \ | | | | | | | | | | | | | | | | Add the :migration metadata, and don't use factories in FixWronglyRenamedRoutes spec See merge request gitlab-org/gitlab-ce!16535
| * | | Add the :migration metadata, and don't use factories in ↵rc/port-from-ee-4119Rémy Coutable2018-01-171-26/+39
| | | | | | | | | | | | | | | | | | | | | | | | FixWronglyRenamedRoutes spec Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '34252-trailing-plus' into 'master'Phil Hughes2018-01-184-1/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot filter issues by labels ending with a plus char in board view" Closes #41715 and #34252 See merge request gitlab-org/gitlab-ce!16490
| * | | | sentence-case changelog entry34252-trailing-plusSimon Knox2018-01-181-2/+2
| | | | |
| * | | | feature spec for #34252Simon Knox2018-01-181-0/+11
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/34252
| * | | | consistent code styleSimon Knox2018-01-181-2/+1
| | | | |
| * | | | add test for search terms with +Simon Knox2018-01-181-2/+9
| | | | |
| * | | | fix board filter parsing - don't replace encoded + symbols with spacesSimon Knox2018-01-163-1/+27
| | | | |
* | | | | Merge branch '41743-unused-selectors-for-cycle-analytics' into 'master'Annabel Dunstone Gray2018-01-182-41/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused CSS selectors for Cycle Analytics (between 1st iteration and 2nd iteration) Closes #41743 See merge request gitlab-org/gitlab-ce!16270
| * | | | | Remove unused CSS selectors for Cycle AnalyticsTakuya Noguchi2018-01-072-41/+5
| | | | | |
* | | | | | Merge branch 'file-content-large-screen-padding' into 'master'Annabel Dunstone Gray2018-01-172-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Double padding for file-content wiki class on larger screens See merge request gitlab-org/gitlab-ce!16534
| * | | | | | Double padding for file-content wiki class on larger screensfile-content-large-screen-paddingtauriedavis2018-01-172-0/+9
| | | | | | |
* | | | | | | Merge branch 'winh-search-page-filters' into 'master'Clement Ho2018-01-174-0/+65
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter groups and projects dropdowns of search page on backend Closes #38739 See merge request gitlab-org/gitlab-ce!16336
| * | | | | | Filter groups and projects dropdowns of search page on backendWinnie Hellmann2018-01-174-0/+65
|/ / / / / /
* | | | | | Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'Stan Hu2018-01-173-28/+111
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Fix bug in security release with deploy keys migration See merge request gitlab-org/gitlab-ce!16531
| * | | | | Applied fixFrancisco Javier López2018-01-173-28/+111
| |/ / / /
* | | | | Merge branch 'rs-buttons-partial' into 'master'Rémy Coutable2018-01-171-21/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Further simplify app/views/projects/buttons/_dropdown.html.haml See merge request gitlab-org/gitlab-ce!16503
| * | | | Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partialRobert Speicher2018-01-161-21/+14
| | | | |
* | | | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-1786-278/+1183
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
| * | | | Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-172-2/+3
| | | | |
| * | | | fixed markdown_spec.jsPhil Hughes2018-01-171-1/+1
| | | | |
| * | | | fixed conflictsPhil Hughes2018-01-172-44/+17
| | | | |
| * | | | Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rbStan Hu2018-01-163-11/+3
| | | | |
| * | | | Update VERSION to 10.3.4Oswaldo Ferreira2018-01-161-0/+4
| | | | |
| * | | | Update CHANGELOG.md for 10.3.4Oswaldo Ferreira2018-01-167-36/+0
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-168-13/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers
| * | | | Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-167-4/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of [10.2] Sanitizes IPython notebook output See merge request gitlab/gitlabhq!2285 (cherry picked from commit 1c46e031c70706450a8e0ae730f4c323b72f9e4c) aac035fe Port of [10.2] Sanitizes IPython notebook output
| * | | | Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-165-16/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Fix RCE via project import mechanism See merge request gitlab/gitlabhq!2294 (cherry picked from commit dcfec507d6f9ee119d65a832393e7c593af1d3b2) 86d75812 Fix RCE via project import mechanism
| * | | | Merge branch ↵Robert Speicher2018-01-165-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2277 (cherry picked from commit 7fc0a6fc096768a5604d6dd24d7d952e53300c82) 073b8f9c Don't allow line breaks on HTTP headers
| * | | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-1633-139/+400
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
| * | | | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-168-20/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create
| * | | | Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-164-2/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Fix path traversal in gitlab-ci.yml cache:key See merge request gitlab/gitlabhq!2270 (cherry picked from commit c32d0c6807dfd41d7838a35742e6d0986871b389) df29094a Fix path traversal in gitlab-ci.yml cache:key
| * | | | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-164-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate project path in Gitlab import - 10.3 port See merge request gitlab/gitlabhq!2268 (cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e) 2b94a7c2 Validate project path in Gitlab import
| * | | | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-167-54/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove order param from the MilestoneFinder See merge request gitlab/gitlabhq!2259 (cherry picked from commit 14408042e78f2ebc2644f956621b461dbfa3d36d) 155881e7 Remove order param from the MilestoneFinder
| * | | | Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-162-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Fix XSS in issue label dropdown See merge request gitlab/gitlabhq!2253 (cherry picked from commit 363ffabcebd7bb0d1a2d59ca1a75e4eadb4a4360) ea1fb0ea Fix XSS in issue label dropdown
| * | | | Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-162-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Fix XSS vulnerability in Pipeline job trace See merge request gitlab/gitlabhq!2258 (cherry picked from commit 44caa80ed9a2514a74a5eeab10ff51849d64851b) 5f86f3ff Fix XSS vulnerability in Pipeline job trace
| * | | | Merge branch ↵Stan Hu2018-01-169-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2281 (cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7) 2bcbbda0 Filter out sensitive fields from the project services API
* | | | | Merge branch 'feature/39591-visibility-level' into 'master'Clement Ho2018-01-172-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open visibility help in new tab Closes #39591 See merge request gitlab-org/gitlab-ce!16268
| * | | | | Open visibility help in new tabJussi Räsänen2018-01-172-1/+6
|/ / / / /
* | | | | Merge branch '41874-closed-todo' into 'master'Douwe Maan2018-01-177-13/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Closed issue label in todo's styling is difficult to read" Closes #41874 See merge request gitlab-org/gitlab-ce!16414
| * | | | | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-177-13/+25
|/ / / / /
View Lorry Controller Status