summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Speed up Commit#repo_changesAhmad Sherif2016-08-031-1/+1
* Bump gitlab_git to speedup DiffCollection iterationsPaco Guzman2016-07-291-1/+1
* Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-281-1/+1
* Merge branch 'cs-upgrade-bullet' into 'master' Robert Speicher2016-07-271-1/+1
|\
| * Upgrade Bullet from 5.0.0 to 5.2.0.cs-upgrade-bulletConnor Shea2016-07-261-1/+1
* | Merge branch 'cs-upgrade-gon' into 'master' Robert Speicher2016-07-271-1/+1
|\ \
| * | Upgrade gon from 6.0.1 to 6.1.0.cs-upgrade-gonConnor Shea2016-07-221-1/+1
| |/
* | Merge branch 'simple-cov' into 'master' Robert Speicher2016-07-271-1/+1
|\ \
| * | Depened on exact version of SimpleCov when patchedsimple-covGrzegorz Bizon2016-07-271-1/+1
| * | Use simplecov 0.12.0 which fixes merging test resultsKamil Trzcinski2016-07-211-1/+1
* | | Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-261-0/+2
* | | Upgrade database_cleaner from 1.4.1 to 1.5.3.cs-upgrade-database-cleanerConnor Shea2016-07-261-1/+1
* | | Add es6 gemJacob Schatz2016-07-251-0/+1
* | | Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-go...Alejandro Rodríguez2016-07-241-1/+1
| |/ |/|
* | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-211-1/+1
* | Bump vmstat version to fix issues reporting on FreeBSDStan Hu2016-07-211-1/+1
|/
* Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher2016-07-201-3/+0
* Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-181-1/+1
|\
| * Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-181-1/+1
* | Merge branch 'csp-basics' into 'master' Robert Speicher2016-07-181-0/+3
|\ \
| * | Initial secure_headers config after some testing.Connor Shea2016-07-181-0/+3
| |/
* | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-1/+1
|/
* Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-3/+3
|\
| * update rouge, gollum-lib, and github-markuphttp://jneen.net/2016-07-141-3/+3
* | Merge branch 'update-rubocop' into 'master' Robert Speicher2016-07-151-1/+1
|\ \ | |/ |/|
| * Resolve feedback.Connor Shea2016-07-131-1/+1
| * Update rubocop to 0.41.2Z.J. van de Weg2016-07-131-1/+1
* | Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea2016-07-131-1/+1
|/
* Update the health_check gem to the latest releaseupdate-health-check-gemDJ Mountney2016-07-111-1/+1
* Merge branch 'bump-omniauth-google-oauth2' into 'master' Robert Speicher2016-07-101-1/+1
|\
| * bump google-omniauth-oauth2 to 0.4.1Pirate Praveen2016-06-231-1/+1
* | Merge branch 'fix_gemfile' into 'master' Rémy Coutable2016-07-081-50/+50
|\ \
| * | set version for gems.bogdanvlviv2016-07-041-15/+15
| * | change `require: nil` to `require: false`bogdanvlviv2016-07-041-1/+1
| * | replace " to ' in Gemfilebogdanvlviv2016-07-041-36/+36
* | | Merge branch 'upgrade-oauth2' into 'master' Robert Speicher2016-07-071-1/+1
|\ \ \
| * | | Upgrade oauth2 from 1.0.0 to 1.2.0.upgrade-oauth2Connor Shea2016-07-011-1/+1
* | | | Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-051-1/+1
|\ \ \ \
| * | | | Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-291-1/+1
* | | | | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-07-051-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Upgrade Doorkeeper from 3.1.0 to 4.0.0.upgrade-doorkeeperConnor Shea2016-07-011-1/+1
* | | | | Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-07-041-1/+1
|\ \ \ \ \
| * | | | | Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-railsConnor Shea2016-07-011-1/+1
* | | | | | Update RedCloth to 4.3.2 for CVE-2012-6684Takuya Noguchi2016-07-031-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'upgrade-thin' into 'master' Robert Speicher2016-07-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Upgrade Thin from 1.6.1 to 1.7.0.Connor Shea2016-07-011-1/+1
| | |/ / | |/| |
* | | | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-railsConnor Shea2016-06-301-1/+0
|/ / /
* | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-0/+1
|\ \ \
| * | | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-0/+1
* | | | Remove coveralls as its unusedremove-converalls-gemZ.J. van de Weg2016-06-301-1/+0
| |/ / |/| |