summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Update devise to version 3.5.4Douglas Barbosa Alexandre2016-01-181-5/+5
* Bump fog to 1.36.0Stan Hu2016-01-111-17/+63
* Add versions to omniauth_crowd and omniauth-azure-oauth2rs-omniauth-client-versionsRobert Speicher2016-01-101-2/+2
* Remove stamp gemRobert Speicher2016-01-071-2/+0
* 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.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
|\
| * Track object counts using the "allocations" GemYorick Peterse2015-12-171-0/+2
| * Instrument all ActiveRecord model methodsYorick Peterse2015-12-171-0/+1
| * Storing of application metrics in InfluxDBYorick Peterse2015-12-171-12/+18
* | Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-281-0/+3
|\ \
| * | 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
* | 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.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 issuers-bump-nokogiriRobert Speicher2015-12-181-1/+2
* | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+5
|\ \ \ | |/ / |/| |
| * | add CAS authentication supporttduehr2015-12-141-0/+5
* | | Bump Rack Attack to v4.3.1 for security fixStan Hu2015-12-181-2/+2
| |/ |/|
* | Upgrade Poltergeist to 1.8.1. #4131issue_4131Rubén Dávila2015-12-171-5/+5
* | Merge branch 'feature/remove-celluloid' into 'master' Dmitriy Zaporozhets2015-12-161-25/+4
|\ \
| * | Update rerun to remove celluloid as dependencyfeature/remove-celluloidGabriel Mazetto2015-12-131-25/+4
| |/
* | Updated Rubocop to latest versionGabriel Mazetto2015-12-141-6/+7
|/
* Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-111-0/+2
* Merge branch 'rs-update-gitlab_emoji' into 'master' Valery Sizov2015-12-111-1/+1
|\
| * Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emojiRobert Speicher2015-12-051-1/+1
* | Merge branch 'bump-devise-3.5.3' into 'master' Dmitriy Zaporozhets2015-12-111-2/+2
|\ \
| * | Bump devise to 3.5.3 to fix reset token expiring after account creationStan Hu2015-12-101-2/+2
* | | Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-101-7/+9
|/ /
* | Remove RedCloth and no longer allow bundle-audit to failDouwe Maan2015-12-091-2/+0
* | Merge branch 'bump-gollum-version' into 'master' Valery Sizov2015-12-081-3/+3
|\ \
| * | Bump gollum-lib to 4.1.0 and fix dependency mismatch with rougeStan Hu2015-12-081-3/+3
* | | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-1/+1
|\ \ \ | |/ / |/| |
| * | Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski2015-12-071-1/+1
| |/
* | add explicit reference to rouge 1.10.1gemfile_fixValery Sizov2015-12-081-0/+1
* | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-071-16/+30
|\ \
| * | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-041-16/+30
| |/
* | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-0/+2
|/
* fix Celluloid warningsValery Sizov2015-12-031-18/+3
* Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-301-100/+145
|\
| * fix specsrails_update_to_4_2Valery Sizov2015-11-301-2/+2