summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* 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
* Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-samlPatricio Cano2016-06-271-5/+4
* Upgrade sentry-raven from 0.15.6 to 1.1.0.Connor Shea2016-06-241-2/+2
* Merge branch 'hamlit-test' into 'master' Robert Speicher2016-06-231-13/+5
|\
| * Restrict hamlit version, remove coffeescript filters.Connor Shea2016-06-231-1/+1
| * Replace Haml with Hamlit.connorshea2016-06-221-13/+5
* | Bump gitlab_git to 10.2.3Stan Hu2016-06-231-1/+1
* | Bump gitlab_git to 10.2.1 to fix false truncated warnings with ISO-8559 filesStan Hu2016-06-231-1/+1
|/
* Merge branch 'update-mail_room-to-0.8.0' into 'master' 18848-pagination-overflows-on-mobileDouwe Maan2016-06-211-2/+2
|\
| * Update mail_room to 0.8.0 to resolve #13357update-mail_room-to-0.8.0Lin Jen-Shin2016-06-211-2/+2
* | Update browser gem to 2.2.0Stan Hu2016-06-201-2/+2
|/
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-2/+2
|\
| * fixed merge conflicts on UI branchJames Lopez2016-06-161-28/+12
| |\
| * | fix gemfileJames Lopez2016-06-131-2/+2
* | | Use gitlab-git 10.2.0bump-gitlab-git-10.2.0Stan Hu2016-06-161-2/+2
* | | Use gitlab_git 10.1.4Jacob Vosmaer2016-06-161-1/+1
| |/ |/|
* | Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-151-2/+0
|\ \
| * | Replace raphael-rails with raphael.js so it can be split from the rest of the...Connor Shea2016-06-101-2/+0
| |/
* | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-151-2/+2
|\ \
| * | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-121-2/+2
| |/
* | Update the allocations Gem to 1.0.5Yorick Peterse2016-06-141-1/+1
View Lorry Controller Status