Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump fog-core to 1.44.3 and fog providers' plugins to latest | Takuya Noguchi | 2017-07-16 | 1 | -1/+1 |
| | |||||
* | Update the mysql2 gem to v0.4.5 | Nick Thomas | 2017-07-14 | 1 | -1/+1 |
| | |||||
* | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master' | Rémy Coutable | 2017-07-12 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Bump scss-lint to 0.54.0 Closes #34858 See merge request !12733 | ||||
| * | Bump scss-lint to 0.54.0 | Takuya Noguchi | 2017-07-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '34867-remove-net-ssh-gem' into 'master' | Rémy Coutable | 2017-07-11 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove net-ssh gem Closes #34867 See merge request !12736 | ||||
| * | | Remove net-ssh gem | Takuya Noguchi | 2017-07-09 | 1 | -1/+0 |
| |/ | |||||
* | | Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'" | Rémy Coutable | 2017-07-11 | 1 | -1/+1 |
| | | | | | | This reverts merge request !12753 | ||||
* | | Merge branch '34902-bump-knapsack-to-1-14-0' into 'master' | Rémy Coutable | 2017-07-11 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Bump knapsack to 1.14.0 Closes #34902 See merge request !12753 | ||||
| * | | Bump knapsack to 1.14.0 | Takuya Noguchi | 2017-07-11 | 1 | -1/+1 |
| |/ | |||||
* | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" | Marin Jankovski | 2017-07-10 | 1 | -1/+0 |
|/ | | | | | This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56. | ||||
* | Add gitaly_git_blob_raw feature | Jacob Vosmaer | 2017-07-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master' | Robert Speicher | 2017-07-07 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#commit_count to Gitaly Closes gitaly#355 See merge request !12688 | ||||
| * | Migrate Gitlab::Git::Repository#commit_count to Gitalyfeature/migrate-commit-count-to-gitaly | Ahmad Sherif | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | | Closes gitaly#355 | ||||
* | | Merge branch 'update-raven-253' into 'master' | Sean McGivern | 2017-07-05 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | 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 | -1/+1 |
| | | | | | | | | 2.5.x branch have updated performance and additional fixes | ||||
* | | Instrument Unicorn with Ruby exporter | Paweł Chojnacki | 2017-07-04 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'bugfix/ruby2.4-compat' into 'master' | Douwe Maan | 2017-06-27 | 1 | -1/+1 |
|\ | | | | | | | | | 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 | -1/+1 |
| | | |||||
* | | Merge branch 'update_bootsnap_1.1.1' into 'master' | Robert Speicher | 2017-06-27 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | | | | | Bump bootsnap to 1.1.1 Closes #34084 See merge request !12425 | ||||
| * | Bump bootsnap to 1.1.1 | blackst0ne | 2017-06-27 | 1 | -0/+1 |
| | | |||||
* | | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ↵ | Stan Hu | 2017-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge branch '31574-bootstrap-form-builder' into 'master' | Phil Hughes | 2017-06-23 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | Add bootstrap_form gem See merge request !10985 | ||||
| * | Add bootstrap_form gem | Nick Thomas | 2017-06-22 | 1 | -0/+1 |
| | | |||||
* | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnap | Robert Speicher | 2017-06-22 | 1 | -1/+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 | -1/+1 |
| | |||||
* | Add rails-i18n for some common translations33344-add-rails-i18n | Lin Jen-Shin | 2017-06-20 | 1 | -0/+1 |
| | |||||
* | Merge branch 'cs-update-rainbow' into 'master' | Rémy Coutable | 2017-06-20 | 1 | -1/+1 |
|\ | | | | | | | | | 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 | -1/+1 |
| | | | | | | | | | | | | 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 | -1/+1 |
|\ \ | | | | | | | | | | | | | 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 | -1/+1 |
| |/ | | | | | | | | | | | 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 | -1/+1 |
|/ | | | | | | 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/+11 |
|\ | | | | | | | | | | | | | 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 | -2/+1 |
| | | | | | | | | 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/+12 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'sh-bump-oauth2-gem' into 'master' | Robert Speicher | 2017-06-09 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | -2/+2 |
| |/ | | | | | | | Closes gitlab-org/omnibus-gitlab#1714 | ||||
* | | Merge branch 'bugfix/upgrade-ruby-parser' into 'master' | Douwe Maan | 2017-06-09 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | 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 | -1/+1 |
| | | |||||
* | | Add Bootsnap to all environments to reduce application startup timers-bootsnap | Robert Speicher | 2017-06-08 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'instrument-infra' into 'master' | Grzegorz Bizon | 2017-06-07 | 1 | -0/+3 |
|\ | | | | | | | | | 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 | -2/+1 |
| | | | | | | | | | | | | | | | | + 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 | -2/+2 |
| | | |||||
| * | Add Prometheus metrics configuration | Pawel Chojnacki | 2017-06-02 | 1 | -0/+4 |
| | | | | | | | | + Cleanup Gemfile | ||||
* | | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master' | Robert Speicher | 2017-06-02 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | 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 | -1/+1 |
| | | |||||
* | | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-provider | Yuanfei Zhu | 2017-06-01 | 1 | -0/+1 |
|/ | |||||
* | Add feature toggles through Flipper | Alejandro Rodríguez | 2017-05-31 | 1 | -0/+4 |
| | |||||
* | Upgrade to task_list v2 | Jared Deckard | 2017-05-23 | 1 | -1/+1 |
| | |||||
* | Add support for deltas_only under Gitaly | Ahmad Sherif | 2017-05-13 | 1 | -1/+1 |
| | | | | 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 | -2/+2 |
| | | | | from 3.1.10 to 3.4.0" |