| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
|
| |
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
|
| | |
| |
| |
| | |
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
Support slash commands in issues / MR description & comments
See merge request !5021
|
| | |\ \
| | |/
| | |
| | |
| | | |
# Conflicts:
# app/services/issues/create_service.rb
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Return only slash commands that make sense for the current noteable
- Allow slash commands decription to be dynamic
Other improvements:
- Add permission checks in slash commands definition
- Use IssuesFinder and MergeRequestsFinder
- Use next if instead of a unless block, and use splat operator instead of flatten
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui' into 'master'
Fix Ace syntax highlighting with compiled assets
## What does this MR do?
Update ACE to 4.1.0 to allow modes (syntax highlighting files for particular languages) to be lazily loaded.
## Are there points in the code the reviewer needs to double check?
Don't think so.
## Why was this MR needed?
Syntax highlighting in the file editor only worked in development and test modes, not in production!
## What are the relevant issue numbers?
Closes #3225.
## Screenshots (if relevant)
First, the test setup - add these lines to `development.rb`:
```ruby
config.assets.debug = false
config.assets.compile = false
config.assets.digest = true
```
Then, before starting the server, run `bundle exec rake assets:clobber assets:precompile`.
Before:
There is an error in the console because `/assets/ace/mode-ruby.js` was not found (it's only available when assets are compiled on demand).
After:
This loads `/assets/ace/mode-ruby-3915f95a6cc47306b1305e4dcb7aca25b2ef9c49b18ec6011707135b6575d8f3.js`, which works because the precompile step included it and told ACE where to find it.
## 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
- ~~Added for this feature/bug~~
- [x] All builds are passing
- [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)
See merge request !5501
|
| | | |/
| |/| |
|
| | | | |
|
| |/ / |
|
| |/
|
|
|
|
| |
Fixes deprecation warnings from Ruby 2.3.
Changelog: https://github.com/nahi/httpclient/blob/b51d7a8bb78f71726b08fbda5abfb900d627569f/CHANGELOG.md#changes-in-282
|
| |
|
|
| |
More information available at: http://weblog.rubyonrails.org/2016/8/11/Rails-5-0-0-1-4-2-7-2-and-3-2-22-3-have-been-released/
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace the tinder gem by bare HTTP requests
## What does this MR do?
It removes the `tinder` gem (used to talk to the Campfire API) and replaces its use by bare HTTP requests.
## Are there points in the code the reviewer needs to double check?
N/A.
## Why was this MR needed?
To simplify the potential dependency hell discussed in #13333.
The initial issue was about updating `http_parser.rb` which was required by `twitter-stream` which was required by `tinder`.
Those 3 gems are not needed anymore.
## What are the relevant issue numbers?
#13333
## Screenshots (if relevant)
N/A.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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)
Closes #13333
See merge request !5758
|
| | | |
|
| |/
|
|
|
|
| |
Changelog: https://github.com/ruby-grape/grape/blob/v0.15.0/CHANGELOG.md
Works toward #18226.
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| | |
Bug fixes and compatibility with Rails 5.
Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
|
| | | |
|
| | | |
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Update attr_encrypted from 3.0.1 to 3.0.2
This removes methods that were deprecated by Rails 5 so we won't have as many deprecation warnings when we update to Rails 5. Working toward #14286.
Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#302
See merge request !5438
|
| | |
| |
| |
| |
| |
| | |
This removes methods that were deprecated by Rails 5.
Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#303
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update rack-oauth2 from 1.2.1 to 1.2.3.
Removes methods deprecated in Rails 5. Working toward #14286.
Changelog: https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3
See merge request !5439
|
| | |/
| |
| |
| |
| |
| | |
Removes methods deprecated in Rails 5.
https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
