Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'update-raven-253' into 'master' | Sean McGivern | 2017-07-05 | 1 | -2/+2 |
|\ | | | | | | | | | Update sentry-raven from 2.4.0 to 2.5.3 See merge request !12605 | ||||
| * | Update sentry-raven from 2.4.0 to 2.5.3update-raven-253 | Gabriel Mazetto | 2017-07-03 | 1 | -2/+2 |
| | | | | | | | | 2.5.x branch have updated performance and additional fixes | ||||
* | | Merge branch 'master' into ↵bump-prometheus-version-to-fix-text-representation-problem | Paweł Chojnacki | 2017-07-04 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | 'bump-prometheus-version-to-fix-text-representation-problem' # Conflicts: # Gemfile.lock | ||||
| * | | Instrument Unicorn with Ruby exporter | Paweł Chojnacki | 2017-07-04 | 1 | -2/+3 |
| |/ | |||||
* | | Update prometheus client gem | Pawel Chojnacki | 2017-07-04 | 1 | -2/+2 |
|/ | |||||
* | Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master' | Douwe Maan | 2017-06-27 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Update mmap2 gem to fix missing symbol error that happens on some installations from source Closes #34221 See merge request !12492 | ||||
| * | Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses ↵34221-fix-missing-method-in-mmap2-gem | Pawel Chojnacki | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | method that is no longer part of Ruby API | ||||
* | | Merge branch 'bugfix/ruby2.4-compat' into 'master' | Douwe Maan | 2017-06-27 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | ruby 2.4 compat: update to webmock 2.3.2 See merge request !12471 | ||||
| * | | ruby 2.4 compat: update to webmock 2.3.2 | http://jneen.net/ | 2017-06-26 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'update_bootsnap_1.1.1' into 'master' | Robert Speicher | 2017-06-27 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Bump bootsnap to 1.1.1 Closes #34084 See merge request !12425 | ||||
| * | | Bump bootsnap to 1.1.1 | blackst0ne | 2017-06-27 | 1 | -0/+4 |
| | | | |||||
* | | | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ↵ | Stan Hu | 2017-06-26 | 1 | -5/+6 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieval of assets Since asset compilation was disabled in GitLab 9.3, the premailer-rails gem would fall back to fetching assets via HTTP(s) since the Sidekiq working directory was not the Rails root. In some instances, SSL verification would fail, preventing e-mails from being sent. premailer-rails 1.9.7 has a fix (https://github.com/fphilipe/premailer-rails/pull/195) that uses an absolute directory to load assets from the filesystem so that the assets can be fetched locally instead of over the network. Closes #34231 | ||||
* | | Use grpc 1.4.0 | Jacob Vosmaer | 2017-06-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '31574-bootstrap-form-builder' into 'master' | Phil Hughes | 2017-06-23 | 1 | -0/+2 |
|\ \ | |/ |/| | | | | | Add bootstrap_form gem See merge request !10985 | ||||
| * | Add bootstrap_form gem | Nick Thomas | 2017-06-22 | 1 | -0/+2 |
| | | |||||
* | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnap | Robert Speicher | 2017-06-22 | 1 | -4/+0 |
|/ | | | | | This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing changes made to 66aad16d1aaa426237e52ef19385385566f194dc. | ||||
* | Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitaly | Ahmad Sherif | 2017-06-21 | 1 | -2/+2 |
| | |||||
* | Add rails-i18n for some common translations33344-add-rails-i18n | Lin Jen-Shin | 2017-06-20 | 1 | -0/+4 |
| | |||||
* | Merge branch 'cs-update-rainbow' into 'master' | Rémy Coutable | 2017-06-20 | 1 | -2/+3 |
|\ | | | | | | | | | Update rainbow from 2.1.0 to 2.2.2. See merge request !12289 | ||||
| * | Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbow | Connor Shea | 2017-06-19 | 1 | -3/+4 |
| | | | | | | | | | | | | Changelog: https://github.com/sickill/rainbow/blob/master/Changelog.md#222-2017-04-21 Adds support for Ruby 2.4. | ||||
* | | Merge branch 'cs-update-paranoia' into 'master' | Rémy Coutable | 2017-06-20 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | Update paranoia from 2.2 to 2.3.1. See merge request !12288 | ||||
| * | | Update paranoia from 2.2 to 2.3.1.cs-update-paranoia | Connor Shea | 2017-06-19 | 1 | -4/+4 |
| |/ | | | | | | | | | | | https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md#230-2017-04-14 Adds support for Rails 5.1. | ||||
* | | Update carrierwave from 1.0.0 to 1.1.0. | Connor Shea | 2017-06-19 | 1 | -3/+3 |
|/ | | | | | | Changelog: https://github.com/carrierwaveuploader/carrierwave/blob/f2f8569b1013f601fe7be4b3a616359acd27240d/CHANGELOG.md#110---2017-04-30 Adds support for Rails 5.1 | ||||
* | Merge branch '29010-perf-bar' into 'master' | Robert Speicher | 2017-06-12 | 1 | -0/+42 |
|\ | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439 | ||||
| * | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres group | Rémy Coutable | 2017-06-09 | 1 | -3/+0 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | New performance bar that can be enabled with the `p b` shortcut | Rémy Coutable | 2017-06-09 | 1 | -0/+45 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'sh-bump-oauth2-gem' into 'master' | Robert Speicher | 2017-06-09 | 1 | -5/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | Bump Faraday and dependent OAuth2 gem version to support no_proxy variable Closes omnibus-gitlab#1714 See merge request !12074 | ||||
| * | | Bump Faraday and dependent OAuth2 gem version to support no_proxy variable | Stan Hu | 2017-06-09 | 1 | -5/+5 |
| |/ | | | | | | | Closes gitlab-org/omnibus-gitlab#1714 | ||||
* | | Merge branch 'bugfix/upgrade-ruby-parser' into 'master' | Douwe Maan | 2017-06-09 | 1 | -3/+3 |
|\ \ | |/ |/| | | | | | Bugfix/upgrade ruby parser See merge request !11861 | ||||
| * | ruby 2.4 support: upgrade ruby_parser to 3.9bugfix/upgrade-ruby-parser | http://jneen.net/ | 2017-06-09 | 1 | -3/+3 |
| | | |||||
* | | Add Bootsnap to all environments to reduce application startup timers-bootsnap | Robert Speicher | 2017-06-08 | 1 | -0/+4 |
|/ | |||||
* | update rouge to 2.1.0 | http://jneen.net/ | 2017-06-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'instrument-infra' into 'master' | Grzegorz Bizon | 2017-06-07 | 1 | -0/+4 |
|\ | | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553 | ||||
| * | Move Prometheus presentation logic to PrometheusText | Pawel Chojnacki | 2017-06-02 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | + Use NullMetrics to mock metrics when unused + Use method_missing in NullMetrics mocking + Update prometheus gem to version that correctly uses transitive dependencies + Ensure correct folders are used in Multiprocess prometheus client tests. + rename Sessions controller's metric | ||||
| * | Correctly handle temporary folder for testing multiproces metrics | Pawel Chojnacki | 2017-06-02 | 1 | -1/+1 |
| | | |||||
| * | Bump prometheus client version | Pawel Chojnacki | 2017-06-02 | 1 | -2/+2 |
| | | |||||
| * | Use the gem for the ruby prometheus client. | Kevin Lyda | 2017-06-02 | 1 | -9/+3 |
| | | |||||
| * | Initial pass at prometheus monitoring. | Kevin Lyda | 2017-06-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a step for #29118. Add a single metric to count successful logins. Summary types are not supported so remove Collector. Either we need to support the summary type or we need to create a multiprocess-friendly Collector. Add config to load prometheus and set up the Collector and the Exporter. Fix `Gemfile` as current prometheus-client gemspec is missing the `mmap2` dependency. | ||||
| * | Add the prometheus gem. | Kevin Lyda | 2017-06-02 | 1 | -0/+10 |
| | | |||||
* | | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master' | Robert Speicher | 2017-06-02 | 1 | -2/+2 |
|\ \ | |/ |/| | | | | | Use the new Gitaly CommitDiff RPC See merge request !11826 | ||||
| * | Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpc | Ahmad Sherif | 2017-06-02 | 1 | -2/+2 |
| | | |||||
* | | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-provider | Yuanfei Zhu | 2017-06-01 | 1 | -0/+6 |
|/ | |||||
* | Add feature toggles through Flipper | Alejandro Rodríguez | 2017-05-31 | 1 | -0/+6 |
| | |||||
* | Merge branch 'task-list-2' into 'master' | Filipa Lacerda | 2017-05-31 | 1 | -4/+2 |
|\ | | | | | | | | | | | | | Update task_list to version 2.0.0 Closes #22470 See merge request !11525 | ||||
| * | Upgrade to task_list v2 | Jared Deckard | 2017-05-23 | 1 | -4/+2 |
| | | |||||
* | | Revert "Merge branch 'grpc-1.3.4' into 'master'" | Jacob Vosmaer (GitLab) | 2017-05-31 | 1 | -1/+1 |
| | | | | | | This reverts merge request !11645 | ||||
* | | Fix omniauth-google-oauth2 dependencies in Gemfile.lock32653-fix-gemfile-lock | Rémy Coutable | 2017-05-30 | 1 | -4/+3 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Use grpc 1.3.4 | Jacob Vosmaer | 2017-05-23 | 1 | -1/+1 |
|/ | |||||
* | Add support for deltas_only under Gitaly | Ahmad Sherif | 2017-05-13 | 1 | -2/+2 |
| | | | | Closes gitaly#199 | ||||
* | Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵ | Dosuken shinya | 2017-05-10 | 1 | -6/+8 |
| | | | | from 3.1.10 to 3.4.0" |