summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \
| * | | | | | Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-railsConnor Shea2016-07-011-20/+20
* | | | | | | Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2Kamil Trzcinski2016-07-041-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'downgrade-redis-3-2-2' into 'master' Robert Speicher2016-07-031-1/+1
|\ \ \ \ \ \
| * | | | | | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2Stan Hu2016-07-011-1/+1
| | |/ / / / | |/| | | |
* | | | | | Update RedCloth to 4.3.2 for CVE-2012-6684Takuya Noguchi2016-07-031-2/+2
|/ / / / /
* | | | | Merge branch 'upgrade-sidekiq' into 'master' Robert Speicher2016-07-011-3/+4
|\ \ \ \ \
| * | | | | Upgrade Sidekiq from 4.1.2 to 4.1.4.upgrade-sidekiqConnor Shea2016-07-011-3/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'upgrade-seedfu' into 'master' Robert Speicher2016-07-011-3/+3
|\ \ \ \ \
| * | | | | Upgrade seed-fu from 2.3.5 to 2.3.6upgrade-seedfuConnor Shea2016-07-011-3/+3
| |/ / / /
* | | | | Merge branch 'upgrade-sass-rails' into 'master' Robert Speicher2016-07-011-2/+2
|\ \ \ \ \
| * | | | | Upgrade sass-rails.upgrade-sass-railsConnor Shea2016-06-301-2/+2
| |/ / / /
* | | | | Merge branch 'upgrade-thin' into 'master' Robert Speicher2016-07-011-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Upgrade Thin from 1.6.1 to 1.7.0.Connor Shea2016-07-011-3/+3
| |/ / /
* | | | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-railsConnor Shea2016-06-301-3/+0
* | | | Upgrade Sprockets and Sprockets Rails.Connor Shea2016-06-301-2/+2
|/ / /
* | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-0/+3
|\ \ \
| * | | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-0/+3
* | | | Remove coveralls as its unusedremove-converalls-gemZ.J. van de Weg2016-06-301-10/+0
| |/ / |/| |
* | | Add fog-rackspace microgem to support backups using rackspace provider.jbub2016-06-291-0/+6
|/ /
* | Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye2016-06-281-2/+0
* | Show basic system info on admin panel. Closes #18886Josh Frye2016-06-281-0/+4
View Lorry Controller Status