summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-181-6/+3
| | | | | | | | | | | | | | | This change is a fairly straightforward refactor to extract the tracing and correlation-id code from the gitlab rails codebase into the new LabKit-Ruby project. The corresponding import into LabKit-Ruby was in https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1 The code itself remains very similar for now. Extracting it allows us to reuse it in other projects, such as Gitaly-Ruby. This will give us the advantages of correlation-ids and distributed tracing in that project too.
* #57815 Omniauth UltraAuth strategyKartikey Tanna2019-04-171-0/+1
|
* Merge branch '17014-remove-rails-deprecated_sanitizer' into 'master'Douwe Maan2019-04-151-1/+0
|\ | | | | | | | | | | | | Resolve "Remove rails-deprecated_sanitizer" Closes #17014 See merge request gitlab-org/gitlab-ce!27268
| * Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-121-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'update-capybara' into 'master'Stan Hu2019-04-121-3/+3
|\ \ | | | | | | | | | | | | Update capybara and selenium-webdriver See merge request gitlab-org/gitlab-ce!27201
| * | Update capybara and selenium-webdriverRémy Coutable2019-04-121-3/+3
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Enable RSpec/ExampleWording copThong Kuah2019-04-121-1/+1
|/
* Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-101-0/+3
| | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* Merge branch 'sh-update-rails-5.0.7.2' into 'master'Robert Speicher2019-04-051-1/+1
|\ | | | | | | | | | | | | Update Rails to 5.0.7.2 Closes #58963 See merge request gitlab-org/gitlab-ce!27022
| * Update Rails to 5.0.7.2Stan Hu2019-04-041-1/+1
| | | | | | | | | | | | | | This fixes a number of issues as described in https://weblog.rubyonrails.org/releases/. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58963
* | Bump rack gem to 2.0.7sh-bump-rack-2.0.7Stan Hu2019-04-041-4/+1
|/ | | | | | | | | | | This update has two important fixes: 1. It reverts the monkey patch introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23385 since https://github.com/rack/rack/pull/1201 is now part of the release. 2. Preserve forwarded IP address for trusted proxy chains (https://github.com/rack/rack/pull/1343).
* Download a folder from repositoryPatrick Bajao2019-04-021-1/+1
| | | | | | | | Add `GetArchiveRequest` to git-archive params. Modifies `Git::Repository#archive_metadata` to append `path` to `ArchivePrefix` so it'll not hit the cache of repository archive when it already exists.
* Upgrade `gitlab-markup` to 1.7.0Gabriel Mazetto2019-03-271-1/+1
| | | | | | | | | | | | | The new version requires `python3` to be available. In omnibus installation this is already a reality as we are currently pathing previous `gitlab-markup` version to use `python3` instead of `python2`. We are now requiring `python3` with the gem without having to patch it. As a consequence to also make it easy to use it in development, we've introduced a `Pipfile` and `Pipfile.lock`, working similarly to `Gemfile` and `Gemfile.lock`, and added documentation on how to use them.
* Upgrade bootstrap_form gemEnrique Alcantara2019-03-251-1/+1
| | | | - Also remove boostrap 4 migration adapter
* Merge branch 'dz-bump-httparty' into 'master'Stan Hu2019-03-201-1/+1
|\ | | | | | | | | | | | | Bump httparty to version 1.16.4 Closes #44342 See merge request gitlab-org/gitlab-ce!25893
| * Bump httparty to version 1.16.4Dmitriy Zaporozhets2019-03-191-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump Rugged to 0.28.0Stan Hu2019-03-191-1/+1
|/ | | | | | | | | | | | | | | | | | This version bump makes things consistent between Gitaly and fixes a significant number of bugs: https://github.com/libgit2/libgit2/releases This also decreases disk space of Omnibus builds by ~30 MB. There is also a workaround for https://github.com/libgit2/rugged/issues/785. If Gitaly or another process changes .gitconfig while Rugged has the file loaded, Rugged::Repository#each_key will report stale values unless a lookup is done first. This bug only manifests in a spec because we are using both Gitaly and Rugged at the same time there, and we normally don't use Rugged in the CE/EE code in this way.
* Update acts-as-taggable-on 5.0 -> 6.0Pirate Praveen2019-03-181-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'pravi/gitlab-ce-update-recaptcha' into 'master'Rémy Coutable2019-03-131-1/+1
|\ | | | | | | | | Update recaptcha gem from 3.x to 4.11 See merge request gitlab-org/gitlab-ce!25921
| * Update recaptcha 3.0 -> 4.11Pirate Praveen2019-03-081-1/+1
| |
* | Prefer node_modules At.js and jquery.carat versionsMike Greiling2019-03-131-1/+0
| | | | | | | | | | Remove references to the vendored copies of At.js and jquery.carat as well as the legacy rails wrapper gem.
* | Update rack-oauth2 1.2.1 -> 1.9.3Pirate Praveen2019-03-121-1/+1
| |
* | Remove select2-rails (select2 is now installed via yarn)Mike Greiling2019-03-081-1/+0
|/
* Revert "Merge branch 'remove-select2-rails' into 'master'"Marin Jankovski2019-03-081-0/+1
| | | This reverts merge request !17871
* remove select2-rails (select2 is now installed via yarn)Praveen Arimbrathodiyil2019-03-081-1/+0
|
* Accept force option on commit via APIPatrick Bajao2019-03-061-1/+1
| | | | | | | | 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.
* Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan2019-03-051-1/+1
|\ | | | | | | | | | | | | Allow raw `tls_options` to be passed in LDAP configuration Closes #46391 See merge request gitlab-org/gitlab-ce!20678
| * Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-041-1/+1
| | | | | | | | | | | | | | 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.
* | Bump Bootsnap to 1.4.1Stan Hu2019-03-011-1/+1
|/ | | | | 1.4.1 contains a number of bug fixes and performance improvements: https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md
* Add a monkey patch that will squelch warnings for legacy Fog gemsStan Hu2019-02-281-1/+3
|
* Bump fog-aws to 3.3.0 and associated dependenciesStan Hu2019-02-281-6/+6
| | | | | Fixes issue with AWS V4 signatures not working with Ceph S3: https://github.com/fog/fog-aws/issues/462
* Support merge to ref for merge-commit and squashOswaldo Ferreira2019-02-251-1/+2
| | | | | | | | 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.
* Merge branch 'dz-bump-version-sorter' into 'master'Stan Hu2019-02-221-1/+1
|\ | | | | | | | | Bump version_sorter to version 2.2.4 See merge request gitlab-org/gitlab-ce!25487
| * Bump version_sorter to version 2.2.4Dmitriy Zaporozhets2019-02-221-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Upgrade Webmock to 3.5.1Stan Hu2019-02-161-1/+1
| | | | | | | | Webmock 3.5.0 brings Ruby 2.6 support.
* | Update Unicorn and associated gemsStan Hu2019-02-141-1/+1
|/ | | | | | | 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
* Update sshkey to v2.0.0Nick Thomas2019-02-111-1/+1
| | | | | | | This release fixes a bug in handling certain ed25519 keys. For more details, see this GitHub issue: https://github.com/bensie/sshkey/issues/34
* Remove HipChat integration from GitLabNick Thomas2019-02-081-3/+0
|
* Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-061-1/+1
|\ | | | | | | | | | | | | Send project name with Gitaly repository requests Closes gitaly#1394 See merge request gitlab-org/gitlab-ce!23373
| * Rename gl_project_name -> gl_project_pathsh-log-project-name-with-gitalyStan Hu2019-02-051-1/+1
| | | | | | | | Upgrade gitaly-proto to 1.10.0 to have this field.
* | Merge branch 'chore/update-js-regex' into 'master'Stan Hu2019-02-061-1/+1
|\ \ | |/ |/| | | | | update js_regex 2.2.1 -> 3.1 See merge request gitlab-org/gitlab-ce!24433
| * update js_regex versionRoger Rüttimann2019-01-141-1/+1
| |
* | Remove Redcarpet markdown engineJan Provaznik2019-02-041-1/+0
| | | | | | | | | | This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
* | Merge branch ↵Sean McGivern2019-02-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | '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
| * | Bump up tasklist package to v2.2.0Fatih Acet2019-01-301-1/+1
| | | | | | | | | | | | v2.1.0 was published wrongly by the package author.
| * | Use original tasklist package with new versionFatih Acet2019-01-301-1/+1
| | |
| * | Temporarily use tasklist from fatihacet’s forkFatih Acet2019-01-301-1/+1
| | |
* | | Fix requiring the rubyzip GemYorick Peterse2019-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | 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`.
* | | Fix uninitialized constant with GitLab Pages deployStan Hu2019-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Extract GitLab Pages using RubyZipKamil Trzciński2019-01-311-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
View Lorry Controller Status