summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changed specfj-42112-fix-deploy-keys-migration-mysql-10-2Francisco Javier López2018-01-171-2/+2
|
* Changed specFrancisco Javier López2018-01-171-3/+15
|
* Added migration specFrancisco Javier López2018-01-173-14/+45
|
* Fixed migrationsFrancisco Javier López2018-01-172-44/+78
|
* Fixing migrationFrancisco Javier López2018-01-172-32/+38
|
* Update VERSION to 10.2.6v10.2.6Oswaldo Ferreira2018-01-111-1/+1
|
* Update CHANGELOG.md for 10.2.6Oswaldo Ferreira2018-01-1110-46/+15
| | | [ci skip]
* Merge branch '10-2-stable-patch-6' into '10-2-stable'Oswaldo Ferreira2018-01-1095-278/+1236
|\ | | | | | | | | Prepare 10.2.6 Security Release See merge request gitlab/gitlabhq!2290
| * Merge branch 'jej/fix-disabled-oauth-access' into 'security-10-2'Robert Speicher2018-01-098-13/+118
| | | | | | | | | | | | | | | | | | Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2223 (cherry picked from commit 43b6135f2226625b5e50d9aa2149a0ea74bb1336) a4bb4a5b Prevents login with disabled OAuth providers
| * Merge branch 'ipython-xss-fix' into 'security-10-2'Jacob Schatz2018-01-098-4/+190
| | | | | | | | | | | | | | | | | | | | Sanitizes IPython notebook output See merge request gitlab/gitlabhq!2237 (cherry picked from commit db98d764c4112dd24bc5ae9ed2bfc01052820309) 8908edbf Sanitizes iPython notebook output 90286ceb fixed karma specs
| * Merge branch ↵Robert Speicher2018-01-085-1/+28
| | | | | | | | | | | | | | | | | | | | | | '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook-10-2' into 'security-10-2' [10.2] Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2287 (cherry picked from commit 1e19734413d46346dd46177d056d9c7165602197) b7664b12 Don't allow line breaks on HTTP headers
| * Merge branch 'fix/import-rce-10-2' into 'security-10-2'James Lopez2018-01-085-16/+68
| | | | | | | | | | | | | | | | | | [10.2] Fix RCE via project import mechanism See merge request gitlab/gitlabhq!2293 (cherry picked from commit 836918b04ed739fe07b239d0e4eab58296218c8c) cec9a6ae Fix RCE via project import mechanism
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-2' into ↵Douwe Maan2018-01-0833-142/+383
| | | | | | | | | | | | | | | | | | | | | | 'security-10-2' [10.2] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2275 (cherry picked from commit b07115bbf3a6f2340e88213f51f699302e6af1d9) 5382c682 Backport to 10.2
| * Merge branch '41567-projectfix-10-2' into 'security-10-2'Sean McGivern2018-01-088-20/+133
| | | | | | | | | | | | | | | | | | [10.2] backport - check project access on MR create See merge request gitlab/gitlabhq!2279 (cherry picked from commit dd1654b7830948347a23521058a1386a8ba97b69) 8b1e50e4 check project access on MR create
| * Merge branch 'security-ac/fix-path-traversal-10-2' into 'security-10-2'Robert Speicher2018-01-084-2/+83
| | | | | | | | | | | | | | | | | | [10.2] Fix path traversal in gitlab-ci.yml cache:key See merge request gitlab/gitlabhq!2271 (cherry picked from commit 9184cd7968665137a18c4823ece239a4a1ca0e46) 1050945a Fix path traversal in gitlab-ci.yml cache:key
| * Merge branch 'sh-validate-path-project-import-10-2' into 'security-10-2'Robert Speicher2018-01-084-2/+71
| | | | | | | | | | | | | | | | | | Validate project path in Gitlab import - 10.2 port See merge request gitlab/gitlabhq!2267 (cherry picked from commit faea8488456aed31915ca9dd6cb2a7d3090294ec) 036fc6c9 Validate project path in Gitlab import
| * Merge branch 'milestones-finder-order-fix-10-2' into 'security-10-2'Robert Speicher2018-01-087-54/+43
| | | | | | | | | | | | | | | | | | Remove order param from the MilestoneFinder - 10.2 port See merge request gitlab/gitlabhq!2264 (cherry picked from commit 54c82aee8d97a7a82fff49197d023e2ebd3247e8) bca5ca97 Remove order param from the MilestoneFinder
| * Merge branch 'label-xss-security' into 'security-10-2'Jacob Schatz2018-01-082-1/+10
| | | | | | | | | | | | | | | | | | [10.2] Fix XSS in issue label dropdown See merge request gitlab/gitlabhq!2251 (cherry picked from commit df15b14521c46aaad5805ae90aa04739d78eec63) 6d693d09 Fix XSS in issue label dropdown
| * Merge branch 'ac/41346-xss-ci-job-output-backport-10-2' into 'security-10-2'Robert Speicher2018-01-083-5/+57
| | | | | | | | | | | | | | | | | | [10.2] Fix XSS vulnerability in Pipeline job trace - backport 10 2 See merge request gitlab/gitlabhq!2260 (cherry picked from commit 4ba826b5df561e85f6fdfc86c20779b1a91b598b) b890d809 Fix XSS vulnerability in Pipeline job trace
| * Merge branch ↵Sean McGivern2018-01-089-18/+52
|/ | | | | | | | | | | 'security-10-2-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-2' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2282 (cherry picked from commit 66b1677940084505123cd519d0894c89dcc60da2) 8b3dcc2a Filter out sensitive fields from the project services API
* Update VERSION to 10.2.5v10.2.5Michael Kozono2017-12-151-1/+1
|
* Update CHANGELOG.md for 10.2.5Michael Kozono2017-12-1512-56/+20
| | | [ci skip]
* Merge branch '10-2-stable-patch-5' into '10-2-stable'Michael Kozono2017-12-1569-325/+722
|\ | | | | | | | | Prepare 10.2.5 release See merge request gitlab-org/gitlab-ce!15925
| * Merge branch 'sh-optimize-groups-api-10-2' into '10-2-stable-patch-5'10-2-stable-patch-5Winnie Hellmann2017-12-1418-60/+292
| |\ | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations (10.2 port) See merge request gitlab-org/gitlab-ce!15926
| | * Solved copy/paste error!Francisco Javier López2017-12-141-4/+5
| | |
| | * Resolving conflictsh-optimize-groups-api-10-2Francisco Javier López2017-12-141-23/+5
| | |
| | * Resolving conflictFrancisco Javier López2017-12-141-5/+6
| | |
| | * Resolving conflictFrancisco Javier López2017-12-141-4/+1
| | |
| | * Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-1418-32/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475 (cherry picked from commit 65b7a7a0632280c77de1dc9d6c93dfb5df0c2fc9) Conflicts: lib/api/groups.rb
| | * Cherry pick lib/api/entities.rb from 763ea26dc6be7760e4084b57bcf56f32e3e9ef0aKamil Trzciński2017-12-141-7/+19
| | |
| * | Merge branch 'bvl-fork-networks-for-deleted-projects-10-2' into ↵Winnie Hellmann2017-12-145-7/+111
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | '10-2-stable-patch-5' Create fork networks for deleted source projects (10.2 port) See merge request gitlab-org/gitlab-ce!15927
| | * | Resolve conflicts in `populate_fork_networks_range.rb`Bob Van Landuyt2017-12-141-3/+0
| | | |
| | * | Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master'Sean McGivern2017-12-145-7/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create fork networks for deleted source projects Closes #40072 See merge request gitlab-org/gitlab-ce!15595 (cherry picked from commit 552c90893059dc5a9a525d7ed79359542f70aad6) Conflicts: lib/gitlab/background_migration/populate_fork_networks_range.rb
| * | | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version-10-2' ↵Winnie Hellmann2017-12-143-13/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into '10-2-stable-patch-5' Update prometheus-client-mmap gem to highly optimized version (10.2 port) See merge request gitlab-org/gitlab-ce!15928
| | * | Resolve conflict in config/initializers/7_prometheus_metrics.rbWinnie Hellmann2017-12-141-12/+0
| | | |
| | * | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into ↵Stan Hu2017-12-143-4/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update prometheus-client-mmap gem to highly optimized version See merge request gitlab-org/gitlab-ce!15796 (cherry picked from commit aa24f7e1abac167189a76590dbaccd5b53726507) Conflicts: config/initializers/7_prometheus_metrics.rb
| * | Merge branch 'winh-upgrade-codeclimate' into 'master'Rémy Coutable2017-12-141-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Upgrade codeclimate image to latest Closes #40255 See merge request gitlab-org/gitlab-ce!15461 (cherry picked from commit c26d7089d058dc22116f383815da8cec80a99ac5) 586d878d Upgrade codeclimate image to 0.70.1 18231881 Use latest codeclimate image again
| * Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-142-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | Properly bump prometheus-client-mmap gem versions See merge request gitlab-org/gitlab-ce!15825 (cherry picked from commit a2d1648076cf55b09562f7ef081fd9e479398ab6) Conflicts: Gemfile Gemfile.lock
| * Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' ↵Tim Zallmann2017-12-142-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Prometheus loading screen no longer seems to appear" Closes #40285 See merge request gitlab-org/gitlab-ce!15889 (cherry picked from commit a8b9852837c3ecde3148a7e989d53fd5ac025bc3) d072c0cd fix broken empty state assets for environment monitoring page 9864720a add CHANGELOG.md entry for !15889
| * Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-145-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab:import:repos Rake task moving repositories into the wrong location Closes #40765 See merge request gitlab-org/gitlab-ce!15823 (cherry picked from commit 7694ae887885c66eb633d3f78eac3128a08dc978) 78f7c3c8 Fix gitlab:import:repos Rake task moving repositories into the wrong location e8cced80 Fix failing importer test case on MySQL due to missing trailing slash in root path 917a112e Simplify normalizing of paths 86661a3a Use build instead of create in importer spec f1eaab7b Remove the need for destroy and add a comment in the spec
| * Merge branch 'sh-bump-redis-actionpack' into 'master'Robert Speicher2017-12-142-15/+15
| | | | | | | | | | | | | | | | | | | | | | Bump redis-rails to 5.0.2 to get redis-store security updates Closes #40889 See merge request gitlab-org/gitlab-ce!15773 (cherry picked from commit 6808d11b058939e61deea8c164f5b01aa19c9176) f76aaa21 Bump redis-rails to 5.0.2 to get redis-store security updates
| * Merge branch 'backport-board-scope-highlight' into 'master'Sean McGivern2017-12-141-0/+10
| | | | | | | | | | | | | | | | | | Backport board scope highlight See merge request gitlab-org/gitlab-ce!15757 (cherry picked from commit 0803a0b3cc6188adc51b034278085f3dba5b53b2) 6f256386 backport board scope highlight
| * Merge branch ↵Jacob Schatz2017-12-142-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | '40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' Replace absolute URLs on related branches/MRs with relative url to avoid hostname Closes #40555 See merge request gitlab-org/gitlab-ce!15735 (cherry picked from commit 73a79f7efbd8dec42b4a344faa3df5bf1c57a315) 88f268b5 Replace absolute URLs on related branches/MRs with relative url to avoid hostname
| * Merge branch '40715-updateendpoint-undefined-on-issue-page' into 'master'Clement Ho2017-12-142-25/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "updateEndpoint undefined on Issue page" Closes #40715 See merge request gitlab-org/gitlab-ce!15698 (cherry picked from commit be8ca260dadae948d09a87664baed8c85d133434) 3e9e773c Remove unused updateUrl and updateEndpoint 0ce9215e Revert updateUrl and updateEndpoint removal and instead pass updateEndpoint… 15b2fc3b simplify props for issue_show app root 4d86f05a Add changelog entry
| * Merge branch '40592-dropdown-options-are-misaligned' into 'master'Clement Ho2017-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | Resolve "Dropdown options are misaligned" Closes #40592 See merge request gitlab-org/gitlab-ce!15693 (cherry picked from commit 2b07c2eeabe5e107d2e6ad973e218736dfc4bcd7) 6a1052c1 remove top from dropdown-label-box that is child of filter-dropdown-item
| * Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-148-72/+61
| | | | | | | | | | | | | | | | | | | | | | Fix the fork project functionality for projects with hashed storage Closes #40711 See merge request gitlab-org/gitlab-ce!15671 (cherry picked from commit 50eb125282ba83e71447161ee2add396fa5eef9b) 327a9898 Fix the fork project functionality for projects with hashed storage
| * Merge branch 'bvl-double-fork' into 'master'Phil Hughes2017-12-144-17/+48
| | | | | | | | | | | | | | | | | | Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653 (cherry picked from commit fbe8dfb3008a0502fbc6234a169851a70707b7b6) 299c5439 Redirect to an already forked project if it exists
| * Merge branch '40543-generalize-detail-page-headers' into 'master'Phil Hughes2017-12-149-79/+66
| | | | | | | | | | | | | | | | | | | | | | Generalize detail page headers (Issues, Merge Requests, Snippets) Closes #40543 See merge request gitlab-org/gitlab-ce!15639 (cherry picked from commit 5d9585d1bde360c9bba2dc960523cbe1e648994f) 6d61b404 Generalize detail page headers
| * Merge branch 'protected-branches-names' into 'master'Douwe Maan2017-12-143-2/+11
| | | | | | | | | | | | | | | | | | Only load branch names for protected branch checks See merge request gitlab-org/gitlab-ce!15629 (cherry picked from commit 1aaa6095a2d8890df73731a8af3d26158a198743) a0527ab8 Only load branch names for protected branch checks
| * Merge branch 'bvl-circuitbreaker-keys-set' into 'master'Douwe Maan2017-12-146-23/+42
|/ | | | | | | | | Keep track of all storage keys in a set See merge request gitlab-org/gitlab-ce!15613 (cherry picked from commit 02111f4d4d03246530e8453d669c63cdbe80fb44) b72d2438 Keep track of all storage keys in a set
View Lorry Controller Status