Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiri | Winnie Hellmann | 2017-09-21 | 1 | -1/+1 |
| | |||||
* | Upgrade gitlab-markup gem | Markus Koller | 2017-09-20 | 1 | -1/+1 |
| | |||||
* | Add test-prof | Rémy Coutable | 2017-09-19 | 1 | -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-codes | Stan Hu | 2017-09-10 | 1 | -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 McGivern | 2017-09-07 | 1 | -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 endpoints | Stan Hu | 2017-09-06 | 1 | -0/+1 |
| | | | | | | | | Closes #36189 | ||||
* | | Merge branch '37411-update-omniauth-google-oauth2' into 'master' | Douwe Maan | 2017-09-07 | 1 | -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-oauth2 | Rémy Coutable | 2017-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch 'gitaly-tree-entries-fix' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -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-fix | Alejandro Rodríguez | 2017-09-06 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'rs-update-capybara' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | Update capybara 2.6.2 -> 2.15.1 See merge request !13976 | ||||
| * | Update capybara 2.6.2 -> 2.15.1 | Robert Speicher | 2017-09-05 | 1 | -1/+1 |
| | | | | | | | | Changelog: https://git.io/v5403 | ||||
* | | Merge branch 'sh-bump-jira-gem' into 'master' | Robert Speicher | 2017-09-05 | 1 | -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 proxies | Stan Hu | 2017-09-05 | 1 | -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 Gitaly | Ahmad Sherif | 2017-09-05 | 1 | -1/+1 |
|/ | |||||
* | Add a linter for PO files | Bob Van Landuyt | 2017-08-31 | 1 | -0/+2 |
| | |||||
* | Upgrade mail and nokogiri gems due to security issues | Markus Koller | 2017-08-31 | 1 | -7/+4 |
| | |||||
* | Update Prometheus Client MMAP gem to version that fixes performance ↵pawel/bump_prometheus_client_mmap_version_to_fix_performance_degradation | Pawel Chojnacki | 2017-08-29 | 1 | -1/+1 |
| | | | | degradation caused by workers churn | ||||
* | Update rubocop-gitlab-security to 0.1.0rs-update-rubocop-gitlab-security | Robert Speicher | 2017-08-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'gitaly-gem-rename' into 'master' | Sean McGivern | 2017-08-25 | 1 | -1/+1 |
|\ | | | | | | | | | Use gitaly-proto 0.31.0 See merge request !13795 | ||||
| * | Use gitaly-proto 0.31.0gitaly-gem-rename | Jacob Vosmaer | 2017-08-24 | 1 | -1/+1 |
| | | |||||
* | | Remove underscore-rails gemrs-remove-underscore-rails | Robert Speicher | 2017-08-23 | 1 | -3/+0 |
|/ | | | | We now manage this dependency in Yarn. | ||||
* | Merge branch '36806-update-rbnacl' into 'master' | Douwe Maan | 2017-08-23 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Update the rbnacl gem to 4.0.2 Closes #36806 See merge request !13740 | ||||
| * | Update the rbnacl gem to 4.0.2 | Nick Thomas | 2017-08-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'gitaly-commit-patch' into 'master' | Sean McGivern | 2017-08-23 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441 | ||||
| * | Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patch | Alejandro Rodríguez | 2017-08-22 | 1 | -1/+1 |
| | | |||||
* | | Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requested | Sean McGivern | 2017-08-21 | 1 | -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_metrics | Pawel Chojnacki | 2017-08-18 | 1 | -1/+1 |
| | | | | rendering many metrics. | ||||
* | Client Implementation: RefService::RefExistsgitaly_ref_exists | Andrew Newdigate | 2017-08-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'ee-2628-backport-to-ce' into 'master' | Douwe Maan | 2017-08-17 | 1 | -2/+0 |
|\ | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627 | ||||
| * | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ce | Tiago Botelho | 2017-08-17 | 1 | -2/+0 |
| | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE | ||||
* | | Upgrade grape to 1.0 | Zeger-Jan van de Weg | 2017-08-16 | 1 | -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.5 | Jacob Vosmaer | 2017-08-16 | 1 | -1/+1 |
|/ | |||||
* | Merge branch '35804-document-table-based-tests' into 'master' | Robert Speicher | 2017-08-14 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469 | ||||
| * | Use rspec-parameterized for table-based tests | Nick Thomas | 2017-08-11 | 1 | -0/+1 |
| | | |||||
* | | Use Prev/Next pagination for exploring projectspagination-projects-explore | Yorick Peterse | 2017-08-14 | 1 | -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 Speicher | 2017-08-11 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Migrate force push check to Gitaly See merge request !13406 | ||||
| * | | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitaly | Ahmad Sherif | 2017-08-11 | 1 | -1/+1 |
| | | | |||||
* | | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4 | Tiago Botelho | 2017-08-11 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Don't require stackprof in Gemfile | Rémy Coutable | 2017-08-09 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Re-enable SqlInjection and CommandInjection | Brian Neel | 2017-08-08 | 1 | -0/+1 |
| | |||||
* | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master' | Robert Speicher | 2017-08-07 | 1 | -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-gitaly | Ahmad Sherif | 2017-08-07 | 1 | -1/+1 |
| | | | | | | | | Closes gitaly#437 | ||||
* | | Backport changes in ↵ | Nick Thomas | 2017-08-07 | 1 | -0/+10 |
|/ | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE | ||||
* | Upgrade haml_lint Gem to 0.26.0 | Winnie Hellmann | 2017-08-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master' | Robert Speicher | 2017-08-04 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Migrate blame loading to Gitaly Closes gitaly#421 See merge request !13155 | ||||
| * | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitaly | Ahmad Sherif | 2017-08-03 | 1 | -1/+1 |
| | | | | | | | | Closes gitaly#421 | ||||
* | | Bump rspec to 3.6.0rs-update-rspec | Robert Speicher | 2017-08-03 | 1 | -2/+2 |
|/ | |||||
* | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitaly | Ahmad Sherif | 2017-08-02 | 1 | -1/+1 |
| | | | | Closes gitaly#415 | ||||
* | Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1 | Takuya Noguchi | 2017-08-01 | 1 | -2/+2 |
| |