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
2019-03-19Merge branch 'sh-bump-rugged-0.28.0' into 'master'Rémy Coutable
Bump Rugged to 0.28.0 See merge request gitlab-org/gitlab-ce!25660 (cherry picked from commit afeb2dd98e4a32a4f5355a59c6db1e599707e9c2) 30caec32 Bump Rugged to 0.28.0
2019-03-08Revert "Merge branch 'remove-select2-rails' into 'master'"Marin Jankovski
This reverts merge request !17871
2019-03-08remove select2-rails (select2 is now installed via yarn)Praveen Arimbrathodiyil
2019-03-06Accept force option on commit via APIPatrick Bajao
When `force` is set to `true` and `start_branch` is set, the branch will be ovewritten with the new commit based on the `HEAD` of the `start_branch`. This commit includes changes to update the `gitaly-proto` gem.
2019-03-05Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan
Allow raw `tls_options` to be passed in LDAP configuration Closes #46391 See merge request gitlab-org/gitlab-ce!20678
2019-03-04Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing
We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future.
2019-03-02Bump Bootsnap to 1.4.1Stan Hu
1.4.1 contains a number of bug fixes and performance improvements: https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md
2019-03-01Add a monkey patch that will squelch warnings for legacy Fog gemsStan Hu
2019-03-01Bump fog-aws to 3.3.0 and associated dependenciesStan Hu
Fixes issue with AWS V4 signatures not working with Ceph S3: https://github.com/fog/fog-aws/issues/462
2019-02-25Support merge to ref for merge-commit and squashOswaldo Ferreira
Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-02-22Merge branch 'dz-bump-version-sorter' into 'master'Stan Hu
Bump version_sorter to version 2.2.4 See merge request gitlab-org/gitlab-ce!25487
2019-02-22Bump version_sorter to version 2.2.4Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-02-17Upgrade Webmock to 3.5.1Stan Hu
Webmock 3.5.0 brings Ruby 2.6 support.
2019-02-15Update Unicorn and associated gemsStan Hu
Unicorn 5.3.1 fixes a GC issue that causes a crash, and Unicorn 5.4.1 quiets some warnings for Ruby 2.6. More details: https://github.com/defunkt/unicorn/releases
2019-02-11Update sshkey to v2.0.0Nick Thomas
This release fixes a bug in handling certain ed25519 keys. For more details, see this GitHub issue: https://github.com/bensie/sshkey/issues/34
2019-02-08Remove HipChat integration from GitLabNick Thomas
2019-02-06Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable
Send project name with Gitaly repository requests Closes gitaly#1394 See merge request gitlab-org/gitlab-ce!23373
2019-02-06Rename gl_project_name -> gl_project_pathStan Hu
Upgrade gitaly-proto to 1.10.0 to have this field.
2019-02-06Merge branch 'chore/update-js-regex' into 'master'Stan Hu
update js_regex 2.2.1 -> 3.1 See merge request gitlab-org/gitlab-ce!24433
2019-02-04Remove Redcarpet markdown engineJan Provaznik
This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
2019-02-04Merge branch ↵Sean McGivern
'19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master' Forms with task lists can be overwritten when editing simultaneously See merge request gitlab-org/gitlab-ce!23938
2019-01-31Fix requiring the rubyzip GemYorick Peterse
In commit 6fa5fd8515e0f2d5a6341134560021f353d84362 the `require: false` was removed to ensure the Gem was loaded at run time. Unfortunately, the `require` necessary for the rubyzip Gem is "zip" and not "rubyzip". As a result, Bundler would not require the Gem. This meant that we would still run into constant errors when referring to `Zip::File`.
2019-01-31Fix uninitialized constant with GitLab Pages deployStan Hu
pages:deploy step was failing with the following error: ``` unitialized constant SafeZip::Extract::Zip ``` Since license_finder already pulls in rubyzip, we can make it a required gem. We also use the scope operator to make the reference to Zip::File explicit.
2019-01-31Extract GitLab Pages using RubyZipKamil Trzciński
RubyZip allows us to perform strong validation of expanded paths where we do extract file. We introduce the following additional checks to extract routines: 1. None of path components can be symlinked, 2. We drop privileges support for directories, 3. Symlink source needs to point within the target directory, like `public/`, 4. The symlink source needs to exist ahead of time.
2019-01-31Bump up tasklist package to v2.2.0Fatih Acet
v2.1.0 was published wrongly by the package author.
2019-01-31Use original tasklist package with new versionFatih Acet
2019-01-31Temporarily use tasklist from fatihacet’s forkFatih Acet
2019-01-25Use http_max_redirects opt to replace monkeypatchThong Kuah
http_max_redirects was introduced in 4.2.2, so upgrade kubeclient. The monkey-patch was global so we will have to check that all instances of Kubeclient::Client are handled. Spec all methods of KubeClient This should provide better confidence that we are indeed disallowing redirection in all cases
2019-01-17Merge branch '26375-markdown-footnotes-not-working' into 'master'Lin Jen-Shin
Markdown footnotes not working Closes #26375 See merge request gitlab-org/gitlab-ce!24168
2019-01-17Update to nokogiri 1.10.1Brett Walker
2019-01-17Conditionally initialize the global opentracing tracerAndrew Newdigate
This change will instantiate an OpenTracing tracer and configure it as the global tracer when the GITLAB_TRACING environment variable is configured. GITLAB_TRACING takes a "connection string"-like value, encapsulating the driver (eg jaeger, etc) and options for the driver. Since each service, whether it's written in Ruby or Golang, uses the same connection-string, it should be very easy to configure all services in a cluster, or even a single development machine to be setup to use tracing. Note that this change does not include instrumentation or propagation changes as this is a way of breaking a previous larger change into components. The instrumentation and propagation changes will follow in separate changes.
2019-01-15Update sidekiq-cron 0.6.0 -> 1.0Pirate Praveen
2019-01-14update js_regex versionRoger Rüttimann
2019-01-12Fix ambiguous brackets in task listsJared Deckard
2019-01-09Update nokogiri to 1.10.0Brett Walker
and truncato to 0.7.11
2019-01-08Merge branch 'update-pg' into 'master'Rémy Coutable
Update pg 0.18.4 -> 1.0 See merge request gitlab-org/gitlab-ce!17829
2019-01-03Merge branch 'sh-bump-mini-test' into 'master'Lin Jen-Shin
Bump minitest to 5.11.3 to match Gitaly version See merge request gitlab-org/gitlab-ce!24070
2019-01-03Update gems in Gemfile and qa/Gemfile to be consistentStan Hu
This will allow developers to run `bundle install` on both directories and avoid additional calls to RubyGems for local development. Also sets up the possibility of improved caching as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/55843.
2019-01-02Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon
Bump Ruby on Rails to 5.0.7.1 See merge request gitlab-org/gitlab-ce!23396
2019-01-01Merge branch 'sh-bump-omniauth-google-gem' into 'master'Sean McGivern
Upgrade Omniauth and JWT gems to switch away from Google+ API Closes #55668 See merge request gitlab-org/gitlab-ce!24068
2018-12-31Merge branch 'rails52-dbcleaner' into 'master'Stan Hu
Bump database_cleaner version Closes #55539 See merge request gitlab-org/gitlab-ce!23985
2018-12-30Bump minitest to 5.11.3 to match Gitaly versionStan Hu
This prevents us from shipping duplicate versions of this gem.
2018-12-29Upgrade Omniauth and JWT gems to switch away from Google+ APIStan Hu
* omniauth-google-oauth2: Google will be deprecating its support for the Google+ API, which currently omniauth-google-oauth2 uses to retrieve user info. The bump in omniauth-google-oauth2 requires an upgrade to ruby-jwt v2+ to support the verification of multiple issue providers (https://github.com/zquestz/omniauth-google-oauth2/pull/345). * jwt: This has the most number of changes that need to be reviewed: https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md * oauth2: Needed to support ruby-jwt v2+: https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md * omniauth-azure-oauth2 needs a version bump to support ruby-jwt v2+. * omniauth: This version bump only involves backstage improvements: https://github.com/omniauth/omniauth/releases Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55668
2018-12-27Update pg to ~> 1.1Pirate Praveen
2018-12-24Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu
Full list of changes: https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md
2018-12-21Bump database_cleaner versionJan Provaznik
should fix issue with: undefined method `schema_migrations_table_name' for ActiveRecord::Migrator:Class https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/135978879
2018-12-21Bump Ruby on Rails to 5.0.7.1blackst0ne
Fix the CVE-2018-16476 vulnerability.
2018-12-21Update minimum version of nokogiriPirate Praveen
Fixes: ActionView::Template::Error (undefined method `add_class' for #<Nokogiri::XML::Element:0x0055dbff5252e8>
2018-12-19Fix sidekiq-reliable-fetch versionValery Sizov
2018-12-19Merge branch 'zj-pool-destruction' into 'master'Kamil Trzciński
Leave object pools when destroying projects Closes gitaly#1415 See merge request gitlab-org/gitlab-ce!23869