summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-bump-octokit' into 'master' Dmitriy Zaporozhets2016-01-271-1/+1
|\
| * Bump octokit to `~> 3.8.0`rs-bump-octokitRobert Speicher2016-01-211-1/+1
* | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-securityRobert Speicher2016-01-251-2/+3
* | rails updated to 4.2.5rails_updateValery Sizov2016-01-251-1/+1
* | Don't use production section for GemfileDmitriy Zaporozhets2016-01-221-3/+3
|/
* Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-0/+3
|\
| * Use sentry in env production onlyJeroen Nijhof2016-01-201-3/+3
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-...Jeroen Nijhof2016-01-201-1/+1
| |\
| * | Add sentry integrationJeroen Nijhof2016-01-181-0/+3
* | | updated gitlab_git to fix issue #5858 and updated changelogJames Lopez2016-01-201-1/+1
| |/ |/|
* | Update devise to version 3.5.4Douglas Barbosa Alexandre2016-01-181-1/+1
|/
* Don't automatically require awesome_printrs-disable-colorizationRobert Speicher2016-01-121-1/+1
* Bump fog to 1.36.0Stan Hu2016-01-111-1/+1
* Add versions to omniauth_crowd and omniauth-azure-oauth2rs-omniauth-client-versionsRobert Speicher2016-01-101-2/+2
* Remove stamp gemRobert Speicher2016-01-071-4/+0
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-1/+1
* Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-061-0/+1
* Merge branch 'rs-bump-bootstrap-sass' into 'master' Dmitriy Zaporozhets2016-01-041-1/+1
|\
| * Bump bootstrap-sass to ~> 3.3.0rs-bump-bootstrap-sassRobert Speicher2016-01-011-1/+1
* | Bump d3_rails to ~> 3.5.0Robert Speicher2016-01-011-1/+1
* | Bump cal-heatmap-rails to ~> 3.5.0Robert Speicher2016-01-011-1/+1
|/
* Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-281-0/+8
|\
| * Track object counts using the "allocations" GemYorick Peterse2015-12-171-0/+1
| * Instrument all ActiveRecord model methodsYorick Peterse2015-12-171-0/+1
| * Storing of application metrics in InfluxDBYorick Peterse2015-12-171-0/+6
* | 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-1/+1
|/ /
* | Bump underscore-rails to ~> 1.8.0rs-bump-underscore-railsRobert Speicher2015-12-231-1/+1
* | Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets2015-12-231-2/+2
|\ \
| * | Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0Robert Speicher2015-12-221-2/+2
* | | Bump sass-rails to ~> 5.0.0rs-update-sass-railsRobert Speicher2015-12-221-1/+1
|/ /
* | Merge branch 'rs-bump-nokogiri' into 'master' Robert Speicher2015-12-221-0/+3
|\ \
| * | Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiriRobert Speicher2015-12-181-0/+3
* | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+1
|\ \ \ | |/ / |/| |
| * | add CAS authentication supporttduehr2015-12-141-0/+1
* | | Bump Rack Attack to v4.3.1 for security fixStan Hu2015-12-181-1/+1
| |/ |/|
* | Upgrade Poltergeist to 1.8.1. #4131issue_4131Rubén Dávila2015-12-171-1/+1
* | Merge branch 'feature/remove-celluloid' into 'master' Dmitriy Zaporozhets2015-12-161-1/+1
|\ \
| * | Update rerun to remove celluloid as dependencyfeature/remove-celluloidGabriel Mazetto2015-12-131-1/+1
| |/
* | Updated Rubocop to latest versionGabriel Mazetto2015-12-141-1/+1
|/
* Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-111-0/+1
* 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-1/+1
|\ \
| * | Bump devise to 3.5.3 to fix reset token expiring after account creationStan Hu2015-12-101-1/+1
* | | Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-101-2/+3
|/ /
* | Remove RedCloth and no longer allow bundle-audit to failDouwe Maan2015-12-091-1/+0
* | Bump gollum-lib to 4.1.0 and fix dependency mismatch with rougeStan Hu2015-12-081-1/+1
* | add explicit reference to rouge 1.10.1gemfile_fixValery Sizov2015-12-081-1/+2