summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Bump grape_logging gem to 1.7.0 to get status codes for error messagessh-bump-grape-logging-for-status-codesStan Hu2017-09-101-2/+2
| | | | | | This recent update fixes an issue in grape_logging where the status code would be "fail" for any non-20x responses. For more details, see: https://github.com/aserafin/grape_logging/issues/29
* Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-0/+3
|\ | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-061-0/+3
| | | | | | | | Closes #36189
* | Merge branch '37411-update-omniauth-google-oauth2' into 'master'Douwe Maan2017-09-071-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Update the omniauth-google-oauth2 gem to 0.5.2 Closes #37411 See merge request !14105
| * | Update the omniauth-google-oauth2 gem to 0.5.237411-update-omniauth-google-oauth2Rémy Coutable2017-09-071-3/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-071-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Implement fix for n+1 issue on `flatten_tree` helper Closes gitaly#530 See merge request !14097
| * | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-061-2/+2
| |/
* | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-071-4/+5
|\ \ | |/ |/| | | | | Update capybara 2.6.2 -> 2.15.1 See merge request !13976
| * Update capybara 2.6.2 -> 2.15.1Robert Speicher2017-09-051-4/+5
| | | | | | | | Changelog: https://git.io/v5403
* | Merge branch 'sh-bump-jira-gem' into 'master'Robert Speicher2017-09-051-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies Closes gitlab-ee#3125 See merge request !13617
| * | Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxiesStan Hu2017-09-051-2/+3
| |/ | | | | | | | | | | | | | | Previous versions of jira-ruby gem would generate erroneous URLs when an HTTP proxy were confused via the `http_proxy` environment variables: https://github.com/sumoheavy/jira-ruby/issues/250 Closes gitlab-org/gitlab-ee#3125
* | Migrate Gitlab::Git::Repository#find_branch to GitalyAhmad Sherif2017-09-051-2/+2
|/
* Merge branch 'bvl-validate-po-files' into 'master'Douwe Maan2017-09-011-0/+2
|\ | | | | | | | | Validate PO files in static analysis See merge request !13000
| * Add a linter for PO filesBob Van Landuyt2017-08-311-0/+2
| |
* | Merge branch 'rouge-2.2.1' into 'master'Sean McGivern2017-09-011-1/+1
|\ \ | |/ |/| | | | | Bump rouge to 2.2.1 See merge request !13887
| * Bump rouge to 2.2.1pbr2017-08-291-1/+1
| |
* | Merge branch 'google-protobuf-3.4.0.2' into 'master'Marin Jankovski2017-08-311-1/+1
|\ \ | | | | | | | | | | | | Use google-protobuf 3.4.0.2 See merge request !13796
| * | Use google-protobuf 3.4.0.2google-protobuf-3.4.0.2Jacob Vosmaer2017-08-241-1/+1
| | |
* | | Upgrade mail and nokogiri gems due to security issuesMarkus Koller2017-08-311-22/+23
| | |
* | | Update Prometheus Client MMAP gem to version that fixes performance ↵pawel/bump_prometheus_client_mmap_version_to_fix_performance_degradationPawel Chojnacki2017-08-291-2/+2
| |/ |/| | | | | degradation caused by workers churn
* | Update rubocop-gitlab-security to 0.1.0rs-update-rubocop-gitlab-securityRobert Speicher2017-08-281-3/+3
| |
* | Merge branch 'gitaly-gem-rename' into 'master'Sean McGivern2017-08-251-2/+2
|\ \ | | | | | | | | | | | | Use gitaly-proto 0.31.0 See merge request !13795
| * | Use gitaly-proto 0.31.0gitaly-gem-renameJacob Vosmaer2017-08-241-2/+2
| |/
* | Remove underscore-rails gemrs-remove-underscore-railsRobert Speicher2017-08-231-2/+0
|/ | | | We now manage this dependency in Yarn.
* Merge branch '36806-update-rbnacl' into 'master'Douwe Maan2017-08-231-3/+3
|\ | | | | | | | | | | | | Update the rbnacl gem to 4.0.2 Closes #36806 See merge request !13740
| * Update the rbnacl gem to 4.0.2Nick Thomas2017-08-221-3/+3
| |
* | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-231-2/+2
|\ \ | |/ |/| | | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441
| * Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-221-2/+2
| |
* | Merge branch 'rouge-2.2.0' into 'master'Sean McGivern2017-08-211-1/+1
|\ \ | |/ |/| | | | | | | | | Bump rouge to 2.2.0 Closes #36554 See merge request !13633
| * Bump rouge to v2.2.0pbr2017-08-191-1/+1
| |
* | Update prometheus mmap client library to fix performance issues when ↵pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metricsPawel Chojnacki2017-08-181-2/+2
| | | | | | | | rendering many metrics.
* | Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-181-2/+2
| |
* | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-171-3/+0
|\ \ | | | | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627
| * | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ceTiago Botelho2017-08-171-3/+0
| | | | | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | | Use grpc 1.4.5grpc-1.4.5Jacob Vosmaer2017-08-171-1/+1
| |/ |/|
* | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-161-9/+6
| | | | | | | | | | Main feature was the deprication of the Hashie stuff, so the access by calling keys as method is gone now.
* | Use charlock_holmes 0.7.5Jacob Vosmaer2017-08-161-2/+2
|/
* Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-08-141-0/+33
|\ | | | | | | | | | | | | Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
| * Use rspec-parameterized for table-based testsNick Thomas2017-08-111-0/+33
| |
* | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-4/+13
| | | | | | | | | | | | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-111-2/+2
|\ \ | | | | | | | | | | | | Migrate force push check to Gitaly See merge request !13406
| * | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-111-2/+2
| | |
* | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-111-2/+2
| |/ |/|
* | Updating Gemfile.lock for rubocop-rspec dependecy.jarv/update-gemfile-lockJohn Jarvis2017-08-091-0/+1
|/ | | | | | | | | | | | | GDK pipeline is failing with this error: ``` Downloading rubocop-rspec-1.15.1 revealed dependencies not in the API or the lockfile (rubocop (>= 0.42.0)). Either installing with `--full-index` or running `bundle update rubocop-rspec` should fix the problem. ``` Updated lockfile by running the bundle update. `gdk install` works now.
* Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
|
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-1/+3
|
* Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-071-2/+2
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259
| * Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-071-2/+2
| | | | | | | | Closes gitaly#437
* | Backport changes in ↵Nick Thomas2017-08-071-0/+10
|/ | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
* Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-071-4/+5
|
View Lorry Controller Status