summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-281-2/+2
* Merge branch 'cs-upgrade-attr-encrypted' into 'master' Robert Speicher2016-07-271-1/+1
|\
| * Update attr_encrypted from 3.0.1 to 3.0.3cs-upgrade-attr-encryptedConnor Shea2016-07-241-1/+1
* | Merge branch 'cs-upgrade-rack-oauth2' into 'master' Robert Speicher2016-07-271-1/+1
|\ \
| * | Update rack-oauth2 from 1.2.1 to 1.2.3.cs-upgrade-rack-oauth2Connor Shea2016-07-221-1/+1
| |/
* | Merge branch 'cs-upgrade-bullet' into 'master' Robert Speicher2016-07-271-4/+4
|\ \
| * | Upgrade Bullet from 5.0.0 to 5.2.0.cs-upgrade-bulletConnor Shea2016-07-261-4/+4
| |/
* | Merge branch 'cs-upgrade-gon' into 'master' Robert Speicher2016-07-271-3/+3
|\ \
| * | Upgrade gon from 6.0.1 to 6.1.0.cs-upgrade-gonConnor Shea2016-07-221-3/+3
| |/
* | Merge branch 'cs-upgrade-default-value-for' into 'master' Robert Speicher2016-07-271-2/+2
|\ \
| * | Upgrade default_value_for from 3.0.1 to 3.0.2.cs-upgrade-default-value-forConnor Shea2016-07-221-2/+2
| |/
* | Merge branch 'simple-cov' into 'master' Robert Speicher2016-07-271-3/+3
|\ \
| * | Depened on exact version of SimpleCov when patchedsimple-covGrzegorz Bizon2016-07-271-1/+1
| * | Remove unused coverallsKamil Trzcinski2016-07-211-3/+3
* | | 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-2/+2
* | | Add es6 gemJacob Schatz2016-07-251-0/+9
* | | Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-go...Alejandro Rodríguez2016-07-241-2/+2
| |/ |/|
* | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-211-2/+2
* | Bump vmstat version to fix issues reporting on FreeBSDStan Hu2016-07-211-2/+2
|/
* Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher2016-07-201-4/+0
* use 2.0.5, actually (2.0.4 was a bad release)feature/rouge-2.0.4http://jneen.net/2016-07-191-1/+1
* upgrade rouge to 2.0.4http://jneen.net/2016-07-191-1/+1
* Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-181-2/+2
|\
| * Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-181-2/+2
* | Merge branch 'csp-basics' into 'master' Robert Speicher2016-07-181-0/+4
|\ \
| * | Initial secure_headers config after some testing.Connor Shea2016-07-181-0/+4
| |/
* | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-2/+2
|/
* Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-9/+9
|\
| * bump rouge to 2.0.3http://jneen.net/2016-07-141-1/+1
| * update to rouge 2.0.2http://jneen.net/2016-07-141-1/+1
| * update rouge, gollum-lib, and github-markuphttp://jneen.net/2016-07-141-9/+9
* | Merge branch 'update-rubocop' into 'master' Robert Speicher2016-07-151-6/+6
|\ \ | |/ |/|
| * Resolve feedback.Connor Shea2016-07-131-1/+1
| * Update rubocop to 0.41.2Z.J. van de Weg2016-07-131-6/+6
* | Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea2016-07-131-31/+31
|/
* Update the health_check gem to the latest releaseupdate-health-check-gemDJ Mountney2016-07-111-3/+3
* Merge branch 'rs-gemfile-lock' into 'master' Robert Speicher2016-07-101-15/+15
|\
| * Update Gemfile.lock after versions were added in !5078Robert Speicher2016-07-101-15/+15
* | Merge branch 'bump-omniauth-google-oauth2' into 'master' Robert Speicher2016-07-101-2/+2
|\ \ | |/ |/|
| * bump google-omniauth-oauth2 to 0.4.1Pirate Praveen2016-06-231-2/+2
* | Merge branch 'upgrade-oauth2' into 'master' Robert Speicher2016-07-071-5/+5
|\ \
| * | Upgrade oauth2 from 1.0.0 to 1.2.0.upgrade-oauth2Connor Shea2016-07-011-5/+5
* | | Merge branch '18593-update-rinku' into 'master' Douwe Maan2016-07-051-1/+1
|\ \ \
| * | | Bump Rinku to 2.0.018593-update-rinkuPaco Guzman2016-07-041-1/+1
* | | | Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-051-4/+2
|\ \ \ \
| * | | | Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-291-4/+2
* | | | | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-07-051-3/+3
|\ \ \ \ \
| * | | | | Upgrade Doorkeeper from 3.1.0 to 4.0.0.upgrade-doorkeeperConnor Shea2016-07-011-3/+3
* | | | | | Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-07-041-20/+20
|\ \ \ \ \ \
View Lorry Controller Status