summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-10-031-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 * upstream/master: (186 commits) Resolve "Precompiled assets with digest strings are ignored in CI" Fix navigation dropdown close animation on mobile screens Add (partial) index on Labels.template Add grpc.log for Gitaly Fix gitaly-proto version in Gemfile.lock refactor issues_controller_spec `update` action Remove edit action for issues Add documentation to summarise project archiving Fix for Gitaly nil encoding issue Fix broken certificate-authority-data with kubectl >= 1.8.0 Improve performance of filtering notes in NotesController Bump gitaly-proto version to v0.39.0 Fix specs for project creation and update services Add CHANGELOG Doesn't check if path exists on disk when renaming a hashed project [ci skip] Fix archive spec descrptions Only copy old/new code when selecting left/right side of parallel diff Fix gitlab-rake gitlab:import:repos task Send extra Gitaly params for `send_git_archive` if needed Update GitLab Pages to v0.6.0 ...
| * Bump gitaly-proto version to v0.39.0feature/bump-gitaly-proto-versionAhmad Sherif2017-10-021-1/+1
| |
| * Create repositories via GitalyJacob Vosmaer2017-09-291-1/+1
| |
| * Migrate Git::Repository#rm_tag to GitalyAhmad Sherif2017-09-281-1/+1
| | | | | | | | Closes gitaly#562
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-09-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 * upstream/master: (130 commits) Handle error when fetching ref for MR with deleted source branch refactor emails service fix update service refactor users update service refactor keys controller refactor some controllers to make them EE friendly fix specs fix users update service update initializers refactor services to match EE signature Change recommended MySQL version to 5.6 Clarify artifact download via the API only accepts branch or tag name for ref Clean merge_jid whenever necessary on the merge process Rolling back change to n+1 detection Breadcrumbs receives padding when double lined karma spec fixes Add EEP to headings Added some Gitaly docs to `docs/development` Check orientation of profile image Fixed missing namespaces on navigation translations ...
| * Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)ueberbit/gitlab-ce-omniauth-azure-oauth2Florian Weber2017-09-261-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Bump google-api-client Gem from 0.8.6 to 0.13.6Shinya Maeda2017-09-261-3/+3
|/
* Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-211-1/+1
|
* Upgrade gitlab-markup gemMarkus Koller2017-09-201-1/+1
|
* Add test-profRémy Coutable2017-09-191-0/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Bump grape_logging gem to 1.7.0 to get status codes for error messagessh-bump-grape-logging-for-status-codesStan Hu2017-09-101-1/+1
| | | | | | 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/+1
|\ | | | | | | | | | | | | 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/+1
| | | | | | | | Closes #36189
* | Merge branch '37411-update-omniauth-google-oauth2' into 'master'Douwe Maan2017-09-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-071-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-1/+1
| |/
* | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-071-1/+1
|\ \ | |/ |/| | | | | Update capybara 2.6.2 -> 2.15.1 See merge request !13976
| * Update capybara 2.6.2 -> 2.15.1Robert Speicher2017-09-051-1/+1
| | | | | | | | Changelog: https://git.io/v5403
* | Merge branch 'sh-bump-jira-gem' into 'master'Robert Speicher2017-09-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+1
| |/ | | | | | | | | | | | | | | 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-1/+1
|/
* Add a linter for PO filesBob Van Landuyt2017-08-311-0/+2
|
* Upgrade mail and nokogiri gems due to security issuesMarkus Koller2017-08-311-7/+4
|
* Update Prometheus Client MMAP gem to version that fixes performance ↵pawel/bump_prometheus_client_mmap_version_to_fix_performance_degradationPawel Chojnacki2017-08-291-1/+1
| | | | degradation caused by workers churn
* Update rubocop-gitlab-security to 0.1.0rs-update-rubocop-gitlab-securityRobert Speicher2017-08-281-1/+1
|
* Merge branch 'gitaly-gem-rename' into 'master'Sean McGivern2017-08-251-1/+1
|\ | | | | | | | | Use gitaly-proto 0.31.0 See merge request !13795
| * Use gitaly-proto 0.31.0gitaly-gem-renameJacob Vosmaer2017-08-241-1/+1
| |
* | Remove underscore-rails gemrs-remove-underscore-railsRobert Speicher2017-08-231-3/+0
|/ | | | We now manage this dependency in Yarn.
* Merge branch '36806-update-rbnacl' into 'master'Douwe Maan2017-08-231-1/+1
|\ | | | | | | | | | | | | 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-1/+1
| |
* | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-231-1/+1
|\ \ | |/ |/| | | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441
| * Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-221-1/+1
| |
* | Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requestedSean McGivern2017-08-211-1/+1
|/ | | | | | | | | This gem allows Sidekiq jobs to be throttled. Unfortunately, it has a side-effect: when we haven't enabled job throttling, it will still hit Redis a lot (and miss, because nothing is configured). As this setting already required a restart, ensure that the library is only required when it's enabled.
* Update prometheus mmap client library to fix performance issues when ↵pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metricsPawel Chojnacki2017-08-181-1/+1
| | | | rendering many metrics.
* Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-181-1/+1
|
* Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-171-2/+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-2/+0
| | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-161-2/+2
| | | | | | | | | | 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-1/+1
|/
* Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-08-141-0/+1
|\ | | | | | | | | | | | | Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
| * Use rspec-parameterized for table-based testsNick Thomas2017-08-111-0/+1
| |
* | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | 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-1/+1
|\ \ | | | | | | | | | | | | 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-1/+1
| | |
* | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-111-1/+1
| |/ |/|
* | Don't require stackprof in GemfileRémy Coutable2017-08-091-1/+1
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-0/+1
|
* Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-071-1/+1
|\ | | | | | | | | | | | | 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-1/+1
| | | | | | | | Closes gitaly#437
View Lorry Controller Status