summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-newrelic' into 'master' Dmitriy Zaporozhets2016-02-041-2/+0
|\ | | | | | | | | | | | | Remove newrelic gem. Closes #12860 See merge request !2682
| * Remove newrelic gem. Closes #12860remove-newrelicJosh Frye2016-02-031-2/+0
| |
* | Updated omniuath-saml to the latest version.omniauth-saml-updatePatricio Cano2016-02-031-4/+4
|/
* Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-031-0/+2
|\ | | | | | | | | | | | | | | | | | | Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
| * Support Akismet spam checking for creation of issues via APIStan Hu2016-02-021-0/+2
| | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* | Merge branch 'update-newrelic-gem' into 'master' Dmitriy Zaporozhets2016-02-021-6/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump New Relic gem version to avoid warnings in Web page This version has support for Grape, so we should consider removing the newrelic-grape gem as well: https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation See merge request !2578
| * | Remove newrelic_grape gem since the New Relic gem now provides native support:Stan Hu2016-01-301-4/+0
| | | | | | | | | | | | https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation
| * | Bump New Relic gem version to avoid warnings in Web pageStan Hu2016-01-301-2/+2
| | |
* | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-021-0/+1
|\ \ \ | | |/ | |/|
| * | Render sanitized SVG imagesStan Hu2016-02-011-0/+1
| |/ | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265
* | Use gitlab_git 8.0.0Jacob Vosmaer2016-02-021-13/+7
| |
* | Update development version of gitlab_gitJacob Vosmaer2016-02-011-1/+1
| |
* | Update gitlab_git@lazy-blob againJacob Vosmaer2016-02-011-1/+1
| |
* | Update gitlab_git (lazy-blob branch)Jacob Vosmaer2016-02-011-2/+2
| |
* | Develop with a custom gitlab_git branchJacob Vosmaer2016-02-011-6/+12
|/
* Update sentry-raven gem.update_sentry_gemMarin Jankovski2016-01-281-1/+1
|
* Merge branch 'rs-bump-octokit' into 'master' Dmitriy Zaporozhets2016-01-271-2/+2
|\ | | | | | | | | | | | | Bump octokit to `~> 3.8.0` Closes #2877 See merge request !2536
| * Bump octokit to `~> 3.8.0`rs-bump-octokitRobert Speicher2016-01-211-2/+2
| | | | | | | | Closes #2877
* | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-securityRobert Speicher2016-01-251-33/+33
| | | | | | | | See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643
* | Merge branch 'rails_update' into 'master' Valery Sizov2016-01-251-30/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Rails updated to 4.2.5 I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383) @dzaporozhets @yorickpeterse See merge request !2591
| * | rails updated to 4.2.5rails_updateValery Sizov2016-01-251-30/+30
| |/
* | Updated gitlab_git to 7.2.24Yorick Peterse2016-01-211-1/+1
|/ | | | | Performance of Gitlab::Git::Repository was improved in merge request gitlab-org/gitlab_git!62.
* Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-0/+3
|\ | | | | | | | | | | | | | | | | | | | | Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jeroen Nijhof2016-01-201-5/+5
| |\ | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| * | Add sentry integrationJeroen Nijhof2016-01-181-0/+3
| | |
* | | updated gitlab_git to fix issue #5858 and updated changelogJames Lopez2016-01-201-2/+2
| |/ |/|
* | Update devise to version 3.5.4Douglas Barbosa Alexandre2016-01-181-5/+5
|/
* Bump fog to 1.36.0Stan Hu2016-01-111-17/+63
| | | | Closes #4231
* Add versions to omniauth_crowd and omniauth-azure-oauth2rs-omniauth-client-versionsRobert Speicher2016-01-101-2/+2
| | | | Also sorts them alphabetically, because OCD.
* Remove stamp gemRobert Speicher2016-01-071-2/+0
| | | | Closes #5908
* fixes ajax issue with issue specajax-issues-fixJacob Schatz2016-01-071-6/+6
|
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-1/+1
|
* Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-061-0/+5
|
* Merge branch 'rs-bump-bootstrap-sass' into 'master' Dmitriy Zaporozhets2016-01-041-5/+5
|\ | | | | | | | | | | | | | | | | Bump bootstrap-sass to ~> 3.3.0 Resolves bootlint error: `bootlint: W013 Bootstrap version might be outdated. Latest version is at least 3.3.6 ; saw what appears to be usage of Bootstrap 3.3.5` See merge request !2275
| * Bump bootstrap-sass to ~> 3.3.0rs-bump-bootstrap-sassRobert Speicher2016-01-011-5/+5
| |
* | Bump d3_rails to ~> 3.5.0Robert Speicher2016-01-011-1/+1
| |
* | Bump cal-heatmap-rails to ~> 3.5.0Robert Speicher2016-01-011-2/+2
|/
* Updated allocations Gem to version 1.0.3update-allocations-gemYorick Peterse2015-12-311-1/+1
|
* Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-281-11/+20
|\ | | | | | | | | | | | | Storing of application metrics in InfluxDB This adds support for tracking metrics in InfluxDB, which in turn can be visualized using Grafana. For more information see #2936. See merge request !2042
| * Track object counts using the "allocations" GemYorick Peterse2015-12-171-0/+2
| | | | | | | | | | This allows us to track the counts of actual classes instead of "T_XXX" nodes. This is only enabled on CRuby as it uses CRuby specific APIs.
| * Instrument all ActiveRecord model methodsYorick Peterse2015-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | This works by searching the raw source code for any references to commonly used ActiveRecord methods. While not bulletproof it saves us from having to list hundreds of methods by hand. It also ensures that (most) newly added methods are instrumented automatically. This _only_ instruments models defined in app/models, should a model reside somewhere else (e.g. somewhere in lib/) it _won't_ be instrumented.
| * Storing of application metrics in InfluxDBYorick Peterse2015-12-171-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to write application metrics (e.g. SQL timings) to InfluxDB. These metrics can in turn be visualized using Grafana, or really anything else that can read from InfluxDB. These metrics can be used to track application performance over time, between different Ruby versions, different GitLab versions, etc. == Transaction Metrics Currently the following is tracked on a per transaction basis (a transaction is a Rails request or a single Sidekiq job): * Timings per query along with the raw (obfuscated) SQL and information about what file the query originated from. * Timings per view along with the path of the view and information about what file triggered the rendering process. * The duration of a request itself along with the controller/worker class and method name. * The duration of any instrumented method calls (more below). == Sampled Metrics Certain metrics can't be directly associated with a transaction. For example, a process' total memory usage is unrelated to any running transactions. While a transaction can result in the memory usage going up there's no accurate way to determine what transaction is to blame, this becomes especially problematic in multi-threaded environments. To solve this problem there's a separate thread that takes samples at a fixed interval. This thread (using the class Gitlab::Metrics::Sampler) currently tracks the following: * The process' total memory usage. * The number of file descriptors opened by the process. * The amount of Ruby objects (using ObjectSpace.count_objects). * GC statistics such as timings, heap slots, etc. The default/current interval is 15 seconds, any smaller interval might put too much pressure on InfluxDB (especially when running dozens of processes). == Method Instrumentation While currently not yet used methods can be instrumented to track how long they take to run. Unlike the likes of New Relic this doesn't require modifying the source code (e.g. including modules), it all happens from the outside. For example, to track `User.by_login` we'd add the following code somewhere in an initializer: Gitlab::Metrics::Instrumentation. instrument_method(User, :by_login) to instead instrument an instance method: Gitlab::Metrics::Instrumentation. instrument_instance_method(User, :save) Instrumentation for either all public model methods or a few crucial ones will be added in the near future, I simply haven't gotten to doing so just yet. == Configuration By default metrics are disabled. This means users don't have to bother setting anything up if they don't want to. Metrics can be enabled by editing one's gitlab.yml configuration file (see config/gitlab.yml.example for example settings). == Writing Data To InfluxDB Because InfluxDB is still a fairly young product I expect the worse. Data loss, unexpected reboots, the database not responding, you name it. Because of this data is _not_ written to InfluxDB directly, instead it's queued and processed by Sidekiq. This ensures that users won't notice anything when InfluxDB is giving trouble. The metrics worker can be started in a standalone manner as following: bundle exec sidekiq -q metrics The corresponding class is called MetricsWorker.
* | Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-281-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Google reCAPTCHA in user registration to prevent spammers To do: - [x] Failing reCAPTCHA test causes all the fields to be lost - ~~[ ] Improve styling of reCAPTCHA box~~ (not possible) - ~~[ ] Put settings in `application_settings` (?)~~ ![image](/uploads/d38ca89820d3c0066fb8aeb645fd77f0/image.png) ![image](/uploads/6b050749963691b023d076682abcf736/image.png) Page when you fail CAPTCHA: ![image](/uploads/bc4846f0a5144985bc41dfa75eeab4c1/image.png) See merge request !2216
| * | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-271-0/+3
| | |
* | | Bump brakeman to ~> 3.1.0Robert Speicher2015-12-271-8/+14
|/ /
* | Bump underscore-rails to ~> 1.8.0rs-bump-underscore-railsRobert Speicher2015-12-231-2/+2
| | | | | | | | Addresses #2857
* | Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets2015-12-231-5/+6
|\ \ | | | | | | | | | | | | | | | | | | Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0 Closes #2859 See merge request !2183
| * | Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0Robert Speicher2015-12-221-5/+6
| | |
* | | Bump sass-rails to ~> 5.0.0rs-update-sass-railsRobert Speicher2015-12-221-6/+7
|/ /
* | Merge branch 'rs-bump-nokogiri' into 'master' Robert Speicher2015-12-221-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154