Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-13Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher
Properly bump prometheus-client-mmap gem versions See merge request gitlab-org/gitlab-ce!15825 (cherry picked from commit a2d1648076cf55b09562f7ef081fd9e479398ab6) 938cc162 Properly bump prometheus-client-mmap gem versions
2017-12-07Update prometheus-client-mmap gem to highly optimized versionPawel Chojnacki
+ change string concatenation to help with GC pressure. + fix metric producing incompatible label sets
2017-12-06Bump redis-rails to 5.0.2 to get redis-store security updatesStan Hu
2017-12-06Merge branch 'downgrade-grpc-to-1.4.5' into 'master'Sean McGivern
Downgrade the grpc gem to 1.4.5 See merge request gitlab-org/gitlab-ce!15746
2017-12-05Downgrade the grpc gem to 1.4.5Jacob Vosmaer
2017-12-05Migrate Gitlab::Git::Repository#revert to GitalyAhmad Sherif
Closes gitaly#780
2017-12-04Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher
Migrate Gitlab::Git::Repository#cherry_pick to Gitaly Closes gitaly#737 See merge request gitlab-org/gitlab-ce!15517
2017-12-04Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif
Closes gitaly#737
2017-12-04Merge branch '40691-upgrade-rails-to-4-2-10' into 'master'Douwe Maan
Resolve "Upgrade Rails to 4.2.10" Closes #40691 See merge request gitlab-org/gitlab-ce!15662
2017-12-04Update parser gem to remove warning about wrong ruby versionGabriel Mazetto
2017-12-01Update Rails to 4.2.10Rémy Coutable
Changes since 4.2.8: - [No change in ActionMailer](https://github.com/rails/rails/blob/v4.2.10/actionmailer/CHANGELOG.md) - [1 change and 1 regression fix in ActionPack](https://github.com/rails/rails/blob/v4.2.10/actionpack/CHANGELOG.md) - [No change in ActiveModel](https://github.com/rails/rails/blob/v4.2.10/activemodel/CHANGELOG.md) - [7 fixes in ActiveRecord](https://github.com/rails/rails/blob/v4.2.10/activerecord/CHANGELOG.md) - [5 fixes in ActiveSupport](https://github.com/rails/rails/blob/v4.2.10/activesupport/CHANGELOG.md) - [No change in Railties](https://github.com/rails/rails/blob/v4.2.10/railties/CHANGELOG.md) Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-30Pin seed-fu to 2.3.6 since 2.3.7 is brokenRémy Coutable
See https://gitlab.com/gitlab-org/gitlab-ce/issues/40690 and https://github.com/mbleigh/seed-fu/issues/123 for details. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-28Lock seed-fu at the correct version in Gemfile.lockRobert Speicher
[ci skip]
2017-11-28Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'Rémy Coutable
Upgrade seed-fu to 2.3.7 Closes #40568 See merge request gitlab-org/gitlab-ce!15607
2017-11-27Update prometheus gem to fix build on RPiPawel Chojnacki
2017-11-27Merge branch '40481-bump-jquery-to-2-2-4' into 'master'Phil Hughes
Upgrade jQuery to 2.2.4 Closes #40481 See merge request gitlab-org/gitlab-ce!15570
2017-11-26Upgrade seed-fu to 2.3.7Takuya Noguchi
2017-11-24Update prometheus Gem to fix compilation on centos 6 duo to GCC not ↵Pawel Chojnacki
recognizing `std=c11` option
2017-11-24Move prometheus middle ware to prometheus initialized.Pawel Chojnacki
2017-11-23Upgrade jQuery to 2.2.4Takuya Noguchi
2017-11-23Update prometheus-client-gem to 0.7.0.beta33Pawel Chojnacki
2017-11-21Batchload blobs for diff generationZeger-Jan van de Weg
After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
2017-11-21Merge branch 'grpc-update' into 'master'Robert Speicher
Update gRPC to v1.7.2 Closes gitaly#742 See merge request gitlab-org/gitlab-ce!15439
2017-11-20Update gRPC to v1.7.2Alejandro Rodríguez
This solves a problem where Gitaly connections through Unix sockets would not work when a proxy was configures, even if a no_proxy setting was specified
2017-11-18Incorporate Gitaly's RefService.DeleteRefs RPCAlejandro Rodríguez
2017-11-16Update license_finder to 3.1.1Winnie Hellmann
2017-11-13Incorporate Gitaly's WikiService.WikiGetAllPages RPCAlejandro Rodríguez
2017-11-03Merge branch 'master' into sh-headless-chrome-supportMike Greiling
* master: (109 commits) Remove Filesystem check metrics that use too much CPU to handle requests Set merge_request_diff_id on MR when creating Add a column linking an MR to its diff Remove useless closeReopenReport specs Clarify external artifacts only working when GitLab pages is enabled Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in Remove an exception from the git user default SSH config check Geo route whitelisting is too optimistic Update .nvmrc to current stable (v9.0.0) Update documentation Address Douwe's feedback Refactor responsive table styles to support nested error block Add changelog items Update specs for sudo behavior Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens Remove user authentication_token column Migrate user private tokens to personal access tokens Add sudo API scope Consistently use PersonalAccessToken instead of PersonalToken Remove User#private_token ...
2017-11-01Update gitlab-markup and PlantUML docsMarkus Koller
2017-11-01Merge branch 'master' into sh-headless-chrome-supportMike Greiling
* master: (84 commits) Migrate Gitlab::Git::Wiki#page to Gitaly Load participants async Normalize LDAP DN when looking up identity Improve the maintenance policy page add changelog fix spec failure Allow promoting project milestones to group milestones fix specs Be able to bundle gems with newer rubies Upgrade Ruby to 2.3.5 fixed up upload feature after master merge fix missing issue assignees Migrate Gitlab::Git::Wiki#delete_page to Gitaly Enable eslint Make `#hashed_storage?` require feature argument Adds callback function to inital cluster request Fix example typo. Upload files through the multi-file editor get branch name from the DOM Resolve "Convert autosize.js library to be a Yarn managed library" ...
2017-10-31Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'Rémy Coutable
Bump carrierwave to 1.2.1 Closes #39580 See merge request gitlab-org/gitlab-ce!15072
2017-10-31Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif
Closes gitaly#673
2017-10-30Update Prometheus Gem to fix problem caused by reading bad data.Pawel Chojnacki
2017-10-30Bump carrierwave to 1.2.1Takuya Noguchi
2017-10-30Merge branch 'master' into sh-headless-chrome-supportMike Greiling
* master: (96 commits) Fetch the merged branches at once Merging EE doc into CE Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername Add KubernetesService#default_namespace tests Revert "Merge branch '36670-remove-edit-form' into 'master'" Fix bitbucket login Remove duped tests Add path attribute to WikiFile class Make local_branches OPT_OUT Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups. Added ssh fingerprint, gitlab ci and pages information in an instance configuration page Fix the incorrect value being used to set GL_USERNAME on hooks Resolve "Remove overzealous tooltips in projects page tabs" ...
2017-10-23Support `Gitaly::User`'s gl_username fieldAlejandro Rodríguez
We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
2017-10-23Merge branch 'master' into sh-headless-chrome-supportMike Greiling
* master: (297 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
2017-10-23The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. ↵Paul B
This merge requests update the gem to v0.2.0 which contains the fix: https://github.com/fog/fog-aliyun/commit/a7456ca6b63e5a0d88c849914679d2fa4707c10c Closes #39126
2017-10-19Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ↵Stan Hu
into 'master' Update Prometheus gem to fix problems with other Processes overwriting current metrics file Closes #36714 See merge request gitlab-org/gitlab-ce!14827
2017-10-19Update Prometheus gem to fix problems with other files overwriting current filePawel Chojnacki
2017-10-16Migrate Gitlab::Git::Wiki#write_page to GitalyAhmad Sherif
Closes gitaly#638
2017-10-13Merge branch 'gitaly-merge' into 'master'Sean McGivern
Merge Merge Requests via Gitaly Closes gitaly#654 See merge request gitlab-org/gitlab-ce!14791
2017-10-13Merge Merge Requests via GitalyJacob Vosmaer
2017-10-13Use grpc 1.6.6Jacob Vosmaer
2017-10-13Merge branch 'master' into sh-headless-chrome-supportMike Greiling
* master: (104 commits) Update licenses fix a wrong method call in the refactor fix a whitespace fix for discussion Update templates via: Update doc accordingly to: Cache issuable template names Fix the format of rugged alternate directory list Match full file path in FileDetector Fixes from CSS refactor Resolve "Prometheus service page shows error" Explicit state integration deletion Move all API authentication code to APIGuard Shorten example translation for inclusive language [ci-skip] add changelog fix the merger override to remove source branch add spec Removed d3.js from the users and graphs bundle Cleanup data-page attribute after each Karma test Update template description wording ...
2017-10-11Use google-protobuf 3.4.1.1Jacob Vosmaer
2017-10-10Run bundleJacob Vosmaer
2017-10-07Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas
2017-10-06Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'Rémy Coutable
Upgrade doorkeeper-openid_connect See merge request gitlab-org/gitlab-ce!14372
2017-10-04Merge branch 'update-unf_ext-0.0.7.4' into 'master'Rémy Coutable
Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368) Closes #38368 See merge request gitlab-org/gitlab-ce!14601