summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-07-041-20/+20
|\ | | | | | | | | | | | | | | | | Upgrade rspec-rails from 3.4.2 to 3.5.0. Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286 Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/ See merge request !5051
| * Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-railsConnor Shea2016-07-011-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | Also upgrade its dependencies. Includes Rails 5 support. Changelogs: rspec-rails: https://github.com/rspec/rspec-rails/compare/v3.4.2...v3.5.0 rspec-core: https://github.com/rspec/rspec-core/compare/v3.4.0...v3.5.0 rspec-support: https://github.com/rspec/rspec-support/compare/v3.4.0...v3.5.0 rspec-expectations: https://github.com/rspec/rspec-expectations/compare/v3.4.0...v3.5.0 rspec-mocks: https://github.com/rspec/rspec-mocks/compare/v3.4.0...v3.5.0 rspec: https://github.com/rspec/rspec/compare/v3.4.0...v3.5.0
* | 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 Sidekiq This affects GitLab 8.8 and 8.9. See: * https://github.com/mperham/sidekiq/blob/master/Changes.md#413 * https://gitlab.com/gitlab-org/gitlab-ce/issues/19441 See merge request !5056
| * | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2Stan Hu2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | See: https://github.com/mperham/sidekiq/blob/master/Changes.md#413 https://gitlab.com/gitlab-org/gitlab-ce/issues/19441
* | | 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. Adds a dependency on Sinatra and allows Sinatra 2 for eventual support of Rack 2. Changelog: https://github.com/mperham/sidekiq/blob/master/Changes.md#414 Working toward #14286. See merge request !5044
| * | Upgrade Sidekiq from 4.1.2 to 4.1.4.upgrade-sidekiqConnor Shea2016-07-011-3/+4
| | | | | | | | | | | | | | | | | | Adds a dependency on Sinatra and allows Sinatra 2 for eventual support of Rack 2. Changelog: https://github.com/mperham/sidekiq/blob/master/Changes.md#414
* | | Merge branch 'upgrade-seedfu' into 'master' Robert Speicher2016-07-011-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade seed-fu from 2.3.5 to 2.3.6 Adds Rails 5 support. Working toward #14286. Changelog: https://github.com/mbleigh/seed-fu/blob/master/CHANGELOG.md#version-236 See merge request !5042
| * | | Upgrade seed-fu from 2.3.5 to 2.3.6upgrade-seedfuConnor Shea2016-07-011-3/+3
| |/ / | | | | | | | | | | | | | | | Adds Rails 5 support. Changelog: https://github.com/mbleigh/seed-fu/blob/master/CHANGELOG.md#version-236
* | | Merge branch 'upgrade-sass-rails' into 'master' Robert Speicher2016-07-011-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade sass-rails ## What does this MR do? Upgrades sass-rails from 5.0.4 to 5.0.5. Includes support for Rails 5. Changelog: https://github.com/rails/sass-rails/releases Working toward #14286 See merge request !5030
| * | | Upgrade sass-rails.upgrade-sass-railsConnor Shea2016-06-301-2/+2
| |/ / | | | | | | | | | | | | | | | Upgrade sass-rails from 5.0.4 to 5.0.5. Includes support for Rails 5. Changelog: https://github.com/rails/sass-rails/releases
* | | Merge branch 'upgrade-thin' into 'master' Robert Speicher2016-07-011-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Upgrade Thin from 1.6.1 to 1.7.0. Includes support for Rack 2. Working toward #14286. Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG See merge request !5047
| * | Upgrade Thin from 1.6.1 to 1.7.0.Connor Shea2016-07-011-3/+3
| |/ | | | | | | | | | | Includes support for Rack 2. Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG
* | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-railsConnor Shea2016-06-301-3/+0
| | | | | | | | | | | | quiet_assets has been seemingly abandoned, and now sprockets-rails has the feature built-in! From this PR: https://github.com/rails/sprockets-rails/pull/355
* | Upgrade Sprockets and Sprockets Rails.Connor Shea2016-06-301-2/+2
|/ | | | | | | | | | Upgrade Sprockets from 3.6.0 to 3.6.2. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Upgrade Sprockets Rails from 3.0.4 to 3.1.1. Changelog: https://github.com/rails/sprockets-rails/compare/v3.0.4...v3.1.1
* Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-0/+3
|\ | | | | | | | | | | | | Loop all disks when displaying system info. Closes #18886 See merge request !4983
| * 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
| | | | Changelog: https://github.com/getsentry/raven-ruby/releases
* Merge branch 'hamlit-test' into 'master' Robert Speicher2016-06-231-13/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | Replace Haml with Hamlit What this change does: - It replaces HAML with [Hamlit](https://github.com/k0kubun/hamlit), a much more efficient implementation of HAML. - It removes `haml-rails`. - It adds `hamlit.rb` and removes `haml.rb`. - It makes things faster and less memory-hungry! See also #13201. See merge request !3666
| * Restrict hamlit version, remove coffeescript filters.Connor Shea2016-06-231-1/+1
| |
| * Replace Haml with Hamlit.connorshea2016-06-221-13/+5
| | | | | | | | | | | | Hamlit is a library that's faster than Haml while implementing most of its features: https://github.com/k0kubun/hamlit Not sure if this breaks anything, but as far as I can tell most things work the same. No obvious regressions that I've been able to find.
* | 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
|/ | | | Closes #18690
* 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 #13357 Update mail_room to 0.8.0 to resolve #13357 Which includes the fix from: https://github.com/tpitale/mail_room/pull/73 See merge request !4835
| * Update mail_room to 0.8.0 to resolve #13357update-mail_room-to-0.8.0Lin Jen-Shin2016-06-211-2/+2
| | | | | | | | | | Which includes the fix from: https://github.com/tpitale/mail_room/pull/73
* | Update browser gem to 2.2.0Stan Hu2016-06-201-2/+2
|/ | | | Fixes https://github.com/fnando/browser/issues/241
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
| * 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 and split it from the rest of the JS ## What does this MR do? Removes raphael.js and its related libraries from the default JS bundle. It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it. This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB. ## Are there points in the code the reviewer needs to double check? That tests pass and that there aren't errors on any pages (especially the Network page). ## Why was this MR needed? It's only used on the Network page and was using way too much bandwidth for just one page. ## What are the relevant issue numbers? #14372 #13165 Follow-up to !4394 and !4516. cc: @jschatz1 See merge request !4519
| * | Replace raphael-rails with raphael.js so it can be split from the rest of ↵Connor Shea2016-06-101-2/+0
| |/ | | | | | | the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently.
* | 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
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark Here was the problem: 1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file. 2. If the blob is text, GitLab will attempt to display it. 3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters. 4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT. To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires an update to gitlab_git: gitlab-org/gitlab_git!86 Closes #13826
* | Update the allocations Gem to 1.0.5Yorick Peterse2016-06-141-1/+1
| | | | | | | | This allows it to be used on Ruby 2.3 without it crashing all the time.
* | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-141-23/+5
|\ \
| * | Update brakeman from 3.2.1 to 3.3.2Connor Shea2016-06-121-23/+5
| |/ | | | | | | | | | | Removes a few dependencies. Changelog: https://github.com/presidentbeef/brakeman/blob/master/CHANGES
* | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+4
|/
* Merge branch 'support-fog-azure' into 'master' Rémy Coutable2016-06-081-0/+21
|\ | | | | | | | | | | | | | | Add fog-azure to supported backup list !4396 left out Azure by accident. See merge request !4444
| * Add Azure to supported backup list (left out accidentally)Stan Hu2016-06-071-0/+21
| |
* | Merge branch 'bump-recaptcha-gem' into 'master' Robert Speicher2016-06-071-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump recaptcha gem to 3.0.0 to remove deprecated stoken support Google deprecated the use of stoken in its reCAPTCHA, so this gem is necessary to make things work again. Closes #18210 See merge request !4484
| * | Bump recaptcha gem to 3.0.0 to remove deprecated stoken supportStan Hu2016-06-071-2/+2
| |/ | | | | | | Closes #18210
* | Bump nokogiri to 1.6.8Stan Hu2016-06-071-3/+5
|/ | | | | Number of important security and bug fixes. See: https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06
View Lorry Controller Status