summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-loosen-request_store' into 'master' Dmitriy Zaporozhets2016-10-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Loosen requirement on request_store version This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868 See merge request !6853
| * Loosen requirement on request_store versionRobert Speicher2016-10-131-1/+1
| | | | | | | | | | | | | | | | This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
* | Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gemGabriel Mazetto2016-10-131-8/+3
| |
* | Use forked github-markup gem to enable python3 support with omnibusGabriel Mazetto2016-10-131-2/+8
|/
* Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan2016-10-121-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve merge request versions compare logic ## What does this MR do? Changes the way how we compare between for merge request versions ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So when I squash+rebase my commit I can get more accurate diff on what changed between versions ## Screenshots (if relevant) in discussion (below) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721 See merge request !6589
| * Bump gitlab_git to 10.6.8Dmitriy Zaporozhets2016-10-121-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Update health_check gem to `~> 2.2.0`Robert Speicher2016-10-121-2/+2
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278
* | Use activerecord_sane_schema_dumperRémy Coutable2016-10-121-0/+3
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'master' into 'master' Rémy Coutable2016-10-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mail_room gem ## What does this MR do? Upgrades the mail_room gem from 0.8.0 to 0.8.1. ## Why was this MR needed? mail_room throws an exception if the watching script joins a undefined thread. Release 0.8.1 adds a check to ensure that the thread exists before calling join. Fixes gitlab-org/omnibus-gitlab#1619. See merge request !6714
| * Update mail_room gemTjaart van der Walt2016-10-061-2/+2
| |
* | Bump mail_room to v0.8.1 to fix thread cleanup issuesh-update-mailroomStan Hu2016-10-101-1/+1
| | | | | | | | Closes #20273
* | Make search results use the markdown cache columns, treating them consistentlyNick Thomas2016-10-071-0/+4
|/ | | | | | Truncato is introduced as a dependency to intelligently shorten the rendered HTML to 200 characters; the previous approach could have resulted in invalid HTML being rendered.
* Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-061-3/+3
|\ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Don't send Private-Token headers to SentryJacob Vosmaer2016-10-041-3/+3
| | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537
* | Update RuboCop to 0.43.0 and update configurationrs-update-rubocopRobert Speicher2016-10-041-3/+3
| | | | | | | | | | `Style/VariableNumber` is explicitly disabled because I don't think we care if we name a variable `var_1` or `var1`.
* | Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.cs-upgrade-acts-as-taggable-onConnor Shea2016-10-031-4/+4
| | | | | | | | Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
* | Replace talk_list patch with a patched forkJared Deckard2016-09-301-3/+5
| |
* | fix broken repo 500 errors in UI and added relevant specsJames Lopez2016-09-291-2/+2
| |
* | Merge branch 'cs-upgrade-devise' into 'master' Robert Speicher2016-09-291-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Devise from 4.1.1 to 4.2.0. This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. It also deprecates `Devise::TestHelpers` in favor of `Devise::Test::ControllerHelpers`. Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01 Working toward #14286, as always. See merge request !6461
| * | Upgrade Devise from 4.1.1 to 4.2.0.Connor Shea2016-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers. Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
* | | Remove Flog as we use a Rubocop that does its job.cs-remove-flog-flayConnor Shea2016-09-281-4/+0
| | |
* | | Bump ruby prof to 0.16Elan Ruusamäe2016-09-281-2/+2
|/ / | | | | | | | | | | | | This solve issues with ruby builds with rubygems preload see https://github.com/ruby-prof/ruby-prof/pull/191 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'zj-remove-deprecation-warnings-sprockets' into 'master' Rémy Coutable2016-09-271-4/+4
|\ \ | | | | | | | | | | | | | | | | | | Remove Sprockets deprecation warning See merge request !6535
| * | Remove Sprockets deprecation warningZ.J. van de Weg2016-09-271-4/+4
| | |
* | | Merge branch 'cs-upgrade-unicorn' into 'master' Robert Speicher2016-09-271-5/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade unicorn and unicorn-worker-killer. Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. This includes Rack 2.0 support which is necessary for Rails 5. Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog See merge request !6463
| * | Upgrade unicorn and unicorn-worker-killer.cs-upgrade-unicornConnor Shea2016-09-211-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog
* | | update sprockets versionubudzisz2016-09-261-2/+2
| |/ |/| | | | | update sprockets version
* | Remove gitlab_meta gemrs-remove-gitlab_metaRobert Speicher2016-09-251-3/+1
|/
* Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"rs-revert-rubocop-rspec-1-7Robert Speicher2016-09-211-3/+3
| | | | | This reverts commit 70faf5fdfbfa0e427b12d4181a9302394974c3cf, reversing changes made to 2307eb84dcd1748cc231719017551111310d1bf9.
* Merge branch 'cs-upgrade-sidekiq' into 'master' Robert Speicher2016-09-211-9/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Sidekiq to 4.2.1, remove dependency on Sinatra This updates Sidekiq to 4.2.1, which adds full support for Rails 5 by removing a dependency on Sinatra which was one of the remaining Rails 5 blockers. Major things to check: Sidekiq still works, obviously. Also that the Web UI/Admin dashboard works and doesn't lose any functionality (based on my testing it works fine). Working toward #14286. Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421 See merge request !6349
| * Upgrade Sidekiq from 4.1.4 to 4.2.1, remove dependency on SinatraConnor Shea2016-09-151-9/+4
| | | | | | | | | | | | | | | | Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421 Sinatra is no longer required and sidekiq uses a vanilla Rack app for its Web UI now.
* | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-201-17/+28
|\ \
| * | Use oj gem for faster JSON processingAhmad Sherif2016-09-161-0/+2
| | | | | | | | | | | | | | | | | | It's mainly intended to improve Elasticsearch indexing performance (through multi_json gem), but other gems could benefit from it too, like grape.
| * | Bump fog-aws and other dependent modulesStan Hu2016-09-161-4/+4
| | | | | | | | | | | | Closes #22260
| * | Bump rubocop-rspec to 1.7.0Robert Speicher2016-09-151-3/+3
| |/
| * Merge branch 'rs-update-rubocop' into 'master' Rémy Coutable2016-09-151-3/+3
| |\ | | | | | | | | | | | | | | | | | | Bump rubocop to 0.42.0 Also updates `.rubocop_todo.yml` for the latest cops. See merge request !6354
| | * Bump rubocop to 0.42.0Robert Speicher2016-09-141-3/+3
| | |
| * | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-09-141-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab_git to 10.6.6 ## What does this MR do? This updates gitlab_git to version 10.6.6 ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? 10.6.4/10.6.5/10.6.6 contains some changes regarding marking blobs as binary, this can improve page loading times. ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - Tests - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22144 See merge request !6279
| | * | Update gitlab_git to 10.6.6Yorick Peterse2016-09-141-3/+3
| | | |
| * | | Merge branch '21748-updating-omniauth-facebook' into 'master' Douwe Maan2016-09-141-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omniauth-facebook to '~>4.0.0' ## What does this MR do? Update omniauth-facebook to '~>4.0.0' ## What are the relevant issue numbers? Closes #21748 cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin See merge request !6321
| | * | | Update omniauth-facebook to '~>4.0.0'Katarzyna Kobierska2016-09-131-3/+3
| | |/ /
| * | | Use haml_lint for views lintingRémy Coutable2016-09-131-0/+9
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | update rouge to 2.0.6http://jneen.net/2016-09-071-1/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-071-4/+2
|\ \ \ | |/ /
| * | Updated gitlab_git to 10.6.3Yorick Peterse2016-09-061-2/+2
| |/ | | | | | | | | This allows us to take advantage of https://gitlab.com/gitlab-org/gitlab_git/merge_requests/121.
| * Optimize branch lookups and force a repository reload for Repository#find_branchsh-reload-find-branchStan Hu2016-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | If `git gc` runs and `Repository` has an instance to `Rugged::Repository`, a bug in libgit2 may cause the instance to return a stale value or a missing branch. This change not only optimizes the branch lookup so we don't have to iterate through every branch, but it also works around the `git gc` issue by forcing a repository reload every time `Repository#find_branch` is called. See: https://github.com/libgit2/libgit2/issues/1534 Closes #15392, #21470
| * remove six, and use a Set insteadhttp://jneen.net/2016-08-301-2/+0
| |
* | Add a spec for the `CycleAnalytics#issue` method.Timothy Andrew2016-08-261-0/+1
|/
* Update vmstat for {Open,Net}BSD supportSean McGivern2016-08-251-2/+2
|
* Merge branch 'rs-update-doorkeeper' into 'master' Robert Speicher2016-08-181-2/+2
|\ | | | | | | | | | | | | Update doorkeeper to 4.2.0 Changelog: https://git.io/v6PnV See merge request !5881
View Lorry Controller Status