summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'upgrade-newrelic-rpm' into 'master' Robert Speicher2016-08-041-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318. ## What does this MR do? While we intend to remove newrelic in the future, it'll probably not happen until 9.0 due to. In the meantime, I'd like to update the gem so it won't block Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG ## Why was this MR needed? Rails 5 compatibility. Relevant issues: #14286, #12860 See merge request !5553
| * Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.upgrade-newrelic-rpmConnor Shea2016-07-281-1/+1
| | | | | | | | | | | | Bug fixes and compatibility with Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
* | 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 Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520-07262016 See merge request !5443
| * Upgrade Bullet from 5.0.0 to 5.2.0.cs-upgrade-bulletConnor Shea2016-07-261-1/+1
| | | | | | | | | | | | Removes methods that were deprecated in Rails 5. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520
* | Merge branch 'cs-upgrade-gon' into 'master' Robert Speicher2016-07-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gon from 6.0.1 to 6.1.0. Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9 See merge request !5442
| * | Upgrade gon from 6.0.1 to 6.1.0.cs-upgrade-gonConnor Shea2016-07-221-1/+1
| |/ | | | | | | | | | | Removes methods that were deprecated in Rails 5. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9
* | Merge branch 'simple-cov' into 'master' Robert Speicher2016-07-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Generate coverage report from whole test suite Extends our CI plan to merge all coverage results and generate HTML report. See merge request !5018
| * | 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
| | | | | | | | | | | | | | | | | | This includes support for Rails 5 without deprecations warnings. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22
* | | Add es6 gemJacob Schatz2016-07-251-0/+1
| | |
* | | Revert "Merge branch ↵Alejandro Rodríguez2016-07-241-1/+1
| |/ |/| | | | | | | '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" This reverts merge request !5375
* | 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
| | | | | This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
* Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Upgrade gemojione to 3.0.0 Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12 [Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada: This update has new emoji and more sensical categories. See merge request !5237
| * Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the 2016 emoji as well as support for using SVG images instead of PNGs. It also fixes a number of incorrectly categorized emoji and other minor issues. Upgrade Rake task for Gemojione 3.0.0 and generate sprites. Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16 For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/ Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
* | Merge branch 'csp-basics' into 'master' Robert Speicher2016-07-181-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Content Security Policy Ref: #18231 This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders). See merge request !4770
| * | 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
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Rouge 2.0 ## What does this MR do? This MR is a refactor of the HTMLGitlab formatter. The original was copy-pasted from the legacy HTML formatter and adapted to suit our needs. In particular, this MR: * Strips dead code and unused options * Factors out the "wrapping" into the places that care about it - Bonzai and the view helpers * Uses the Rouge 2.0 `token_lines` method to split tokens into lines, removing the custom code we used to do the same * Uses the now-public `span` method instead of re-implementing it ourselves * Removes options to not split into lines - the places where this feature wasn't being used are now using the plain `Formatters::HTML` instead of this class See merge request !4691
| * 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
|\ \ | |/ |/| | | | | | | | | Update rubocop to 0.41.2 Adds a couple of cops to the TODO files, but I wanted [a specific cop](https://github.com/bbatsov/rubocop/pull/3135/files) which just had about 65 offences, so Ill do that later. See merge request !4999
| * Resolve feedback.Connor Shea2016-07-131-1/+1
| |
| * Update rubocop to 0.41.2Z.J. van de Weg2016-07-131-1/+1
| | | | | | | | https://github.com/bbatsov/rubocop/blob/v0.41.2/CHANGELOG.md
* | Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea2016-07-131-1/+1
|/ | | | | | Primarily just bug fixes. Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7
* Update the health_check gem to the latest releaseupdate-health-check-gemDJ Mountney2016-07-111-1/+1
| | | | This allows us to drop our disable email config override
* Merge branch 'bump-omniauth-google-oauth2' into 'master' Robert Speicher2016-07-101-1/+1
|\ | | | | | | | | | | | | Bump google-omniauth-oauth2 to 0.4.1 Closes #19064 See merge request !4882
| * 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gemfile 1. replace `"` to `'` in Gemfile. 2. change `require: nil` to `require: false`. `require: nil` and `require: false` get same result, but i think we shouldn't write it differently in other places. 3. set version for gems. better gem's version control for prevent dependency errors. See merge request !5078
| * | set version for gems.bogdanvlviv2016-07-041-15/+15
| | | | | | | | | | | | better gem's version control for prevent dependency errors.
| * | change `require: nil` to `require: false`bogdanvlviv2016-07-041-1/+1
| | | | | | | | | | | | require: nil and require: false get same result, but i think we shouldn't write it differently in other places.
| * | 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. Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0 Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use. Adds support for Rails 5. Working toward #14286. See merge request !5041
| * | | Upgrade oauth2 from 1.0.0 to 1.2.0.upgrade-oauth2Connor Shea2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0 Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.
* | | | Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione - No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem? - Fixes the Rake task since it broke after all the AwardEmoji changes. - Update gemojione to 2.6.1. Spring Update changes! http://emojione.com/releases/#2.2.0 See merge request !4919
| * | | | Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Also fix the Rake task and update gemojione to 2.6.1. This adds the EmojiOne Spring update. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md
* | | | | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-07-051-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Doorkeeper from 3.1.0 to 4.0.0. Includes Rails 5 support and various bug fixes. Working toward #14286. Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400 See merge request !5055
| * | | | Upgrade Doorkeeper from 3.1.0 to 4.0.0.upgrade-doorkeeperConnor Shea2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes Rails 5 support and various bug fixes. Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
* | | | | Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-07-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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. 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-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | 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-1/+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
* | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Loop all disks when displaying system info. Closes #18886 See merge request !4983
View Lorry Controller Status