summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* update to support latest bcrypt. resolves #48149Muhammad Nuzaihan2018-07-011-1/+1
|
* Don't hash user ID in OIDC subject claimMarkus Koller2018-06-281-8/+4
|
* Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-271-2/+2
| | | | | | | | | | | | | | Prior to this change, health checks checked for writeability of the NFS shards. Given we're moving away from that, this patch extends the checks for Gitaly to check for read and writeability. Potentially some dashboards will break, as over time these metrics will no longer appear as Prometheus doesn't get the data anymore. Observability in the circuit breaker will be reduced, but its not expected to be turned on and the circuit breaker is being removed soon too. Closes https://gitlab.com/gitlab-org/gitaly/issues/1218
* Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-251-4/+8
|\
| * Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-251-4/+8
| |\ | | | | | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399
| | * Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5Francisco Javier López2018-06-151-4/+8
| | |
* | | Bump sprockets to 3.7.2 to address CVE-2018-3760Robert Speicher2018-06-221-1/+1
|/ /
* | Merge branch 'remove-allocations-gem' into 'master'Stan Hu2018-06-201-2/+0
|\ \ | | | | | | | | | | | | Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029
| * | Remove remaining traces of the Allocations Gemremove-allocations-gemYorick Peterse2018-06-201-2/+0
| | | | | | | | | | | | | | | | | | | | | In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem.
* | | Merge branch 'sh-bump-rugged-0.27.2' into 'master'Rémy Coutable2018-06-201-1/+1
|\ \ \ | |/ / |/| | | | | | | | Bump rugged to 0.27.2 See merge request gitlab-org/gitlab-ce!20026
| * | Bump rugged to 0.27.2sh-bump-rugged-0.27.2Stan Hu2018-06-201-1/+1
| |/ | | | | | | Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.2
* | Migrate repo backup to gitalyAhmad Hassan2018-06-151-2/+2
|/
* Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapterFrancisco Javier López2018-06-121-2/+2
|
* Merge branch 'rs-update-rspec' into 'master'Rémy Coutable2018-06-111-17/+17
|\ | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449
| * Update rspec to 3.7Robert Speicher2018-06-071-17/+17
| |
* | Merge branch 'upgrade-gitlab-markup' into 'master'Douwe Maan2018-06-111-2/+2
|\ \ | | | | | | | | | | | | Upgrade gitlab-markup to fix render issue with reStructuredText See merge request gitlab-org/gitlab-ce!19596
| * | Upgrade gitlab-markup to fix render issue with reStructuredTextGabriel Mazetto2018-06-081-2/+2
| | |
* | | Bump grape-path-helpers to 1.0.5blackst0ne2018-06-081-2/+2
| | |
* | | Merge branch 'rails5-fix-47370' into 'master'Douwe Maan2018-06-081-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use same gem versions for rails5 as for rails4 where possible Closes #47370, #46232, #47367, and #47373 See merge request gitlab-org/gitlab-ce!19498
| * | | Use same gem versions for rails5 as for rails4 where possibleJasper Maes2018-06-071-1/+0
| | | |
* | | | Merge branch 'use-restore-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use RestoreCustomHooks RPC in restore rake task See merge request gitlab-org/gitlab-ce!19370
| * | | | Use RestoreCustomHooks RPC in restore rake taskAhmad Hassan2018-06-071-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-071-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * | | favicon uploader generating ci status faviconsAlexis Reigel2018-06-051-0/+2
| | | |
* | | | Merge branch 'sh-bump-grape-path-helpers' into 'master'Sean McGivern2018-06-071-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcher See merge request gitlab-org/gitlab-ce!19506
| * | | Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcherStan Hu2018-06-061-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | If you include this helper with a class that also implements `method_missing`, this would result in AbstractController::DoubleRenderError. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19487#note_79096902.
* | | Merge branch 'update-net-ssh' into 'master'Grzegorz Bizon2018-06-071-8/+4
|\ \ \ | |/ / |/| | | | | | | | update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed) See merge request gitlab-org/gitlab-ce!19412
| * | update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed)Pirate Praveen2018-06-061-8/+4
| |/
* | Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan2018-06-061-0/+6
|\ \ | | | | | | | | | | | | | | | | | | GraphQL setup: Basic Project and Merge request endpoint Closes #34754 See merge request gitlab-org/gitlab-ce!19008
| * | Initial setup GraphQL using graphql-ruby 1.8Bob Van Landuyt2018-06-061-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | - All definitions have been replaced by classes: http://graphql-ruby.org/schema/class_based_api.html - Authorization & Presentation have been refactored to work in the class based system - Loaders have been replaced by resolvers - Times are now coersed as ISO 8601
| * | Convert from GraphQL::Batch to BatchLoaderNick Thomas2018-06-051-1/+0
| | |
| * | Add a minimal GraphQL APINick Thomas2018-06-051-0/+17
| |/
* | Bump grape-path-helpers to 1.0.2 to get updated Rake task namingStan Hu2018-06-061-1/+1
|/ | | | Add development documentation on how to generate a list of routes
* Merge branch 'update-doorkeeper' into 'master'Rémy Coutable2018-06-041-1/+1
|\ | | | | | | | | | | | | Update Doorkeeper OpenID for Kubernetes support Closes #44485 See merge request gitlab-org/gitlab-ce!19293
| * Update Doorkeeper OpenID for Kubernetes supportMaxime Guyot2018-05-311-1/+1
| |
* | Merge branch '46845-update-email_spec-to-2-2-0' into 'master'Robert Speicher2018-06-041-3/+4
|\ \ | | | | | | | | | | | | | | | | | | Update email_spec to 2.2.0 Closes #46845 See merge request gitlab-org/gitlab-ce!19164
| * | Update email_spec to 2.2.0Takuya Noguchi2018-06-031-3/+4
| | |
* | | Bump octokit to 4.947193-uri-invalidurierror-bad-uri-is-not-uri-users-xxx-botAsh McKenzie2018-06-041-2/+2
| | |
* | | Update selenium-webdriver to 3.12.0Takuya Noguchi2018-06-041-4/+4
|/ /
* | Bump omniauth-gitlab to 1.0.3Stan Hu2018-06-011-1/+1
|/ | | | | | This version of the gem uses API v4 by default: https://github.com/linchus/omniauth-gitlab/commit/fd13de9f251fdaa72ba0195bda47cd2cb8731084
* Export assigned issues in iCalendar feedImre Farkas2018-05-311-0/+2
|
* Merge branch 'dz-awesome-print-version-unlock' into 'master'Robert Speicher2018-05-301-1/+1
|\ | | | | | | | | Remove version lock on awesome_print dependency See merge request gitlab-org/gitlab-ce!19232
| * Remove version lock on awesome_print dependencyDmitriy Zaporozhets2018-05-301-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-301-6/+6
|\ \ | | | | | | | | | | | | | | | | | | Replace grape-route-helpers with our own grape-path-helpers Closes #45718 See merge request gitlab-org/gitlab-ce!19240
| * | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-301-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes: 1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21 2. Fixes some broken specs and code for Grape 1.0+ 3. Optimizes the generation of paths by bringing in @dblessing's HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793 Closes #45718
* | | Merge branch 'bump-kubeclient-version-3-1-0' into 'master'Rémy Coutable2018-05-301-5/+5
|\ \ \ | |_|/ |/| | | | | | | | Bumps kubeclient gem version to 3.1.0 See merge request gitlab-org/gitlab-ce!19199
| * | Bumps kubeclient gem version to 3.1.0bump-kubeclient-version-3-1-0Tiago Botelho2018-05-291-5/+5
| | |
* | | Merge branch '46844-update-awesome_print-to-1-8-0' into 'master'Dmitriy Zaporozhets2018-05-301-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Update awesome_print to 1.8.0 Closes #46844 See merge request gitlab-org/gitlab-ce!19163
| * | Update awesome_print to 1.8.0Takuya Noguchi2018-05-291-2/+2
| |/
* | Bump rugged to 0.27.1 for security fixesStan Hu2018-05-291-1/+1
| |