| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
| |
| |
| | |
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278
|
|/
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| | |
Closes #20273
|
|/
|
|
|
|
| |
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.
|
|\
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
| |
| |
| | |
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537
|
| |
| |
| |
| |
| | |
`Style/VariableNumber` is explicitly disabled because I don't think we
care if we name a variable `var_1` or `var1`.
|
| |
| |
| |
| | |
Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Remove Sprockets deprecation warning
See merge request !6535
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 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 version
|
|/ |
|
|
|
|
|
| |
This reverts commit 70faf5fdfbfa0e427b12d4181a9302394974c3cf, reversing
changes made to 2307eb84dcd1748cc231719017551111310d1bf9.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
It's mainly intended to improve Elasticsearch indexing performance
(through multi_json gem), but other gems could benefit from it too, like
grape.
|
| | |
| | |
| | |
| | | |
Closes #22260
|
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Bump rubocop to 0.42.0
Also updates `.rubocop_todo.yml` for the latest cops.
See merge request !6354
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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 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
|
| | |/ / |
|
| |/ /
| | |
| | |
| | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | | |
|
|\ \ \
| |/ / |
|
| |/
| |
| |
| |
| | |
This allows us to take advantage of
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/121.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|/ |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Update doorkeeper to 4.2.0
Changelog: https://git.io/v6PnV
See merge request !5881
|
| |
| |
| |
| | |
Changelog: https://git.io/v6PnV
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Update Hamlit to 2.6.1
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
See merge request !5873
|