summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Update RuboCop to 0.43.0 and update configurationrs-update-rubocopRobert Speicher2016-10-041-1/+1
| | | | | `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-1/+1
| | | | Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
* Align gem version stringsJared Deckard2016-09-301-10/+10
|
* Replace talk_list patch with a patched forkJared Deckard2016-09-301-1/+1
|
* fix broken repo 500 errors in UI and added relevant specsJames Lopez2016-09-291-1/+1
|
* Merge branch 'cs-upgrade-devise' into 'master' Robert Speicher2016-09-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | 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-1/+0
| |
* | Bump ruby prof to 0.16Elan Ruusamäe2016-09-281-1/+1
|/ | | | | | | 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-2/+2
|\ | | | | | | | | | | | | Remove Sprockets deprecation warning See merge request !6535
| * Remove Sprockets deprecation warningZ.J. van de Weg2016-09-271-2/+2
| |
* | Merge branch 'cs-upgrade-unicorn' into 'master' Robert Speicher2016-09-271-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | | | | | | | | | 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-3/+1
| | | | | | | | update sprockets version
* | Remove gitlab_meta gemrs-remove-gitlab_metaRobert Speicher2016-09-251-4/+0
|/
* Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"rs-revert-rubocop-rspec-1-7Robert Speicher2016-09-211-1/+1
| | | | | This reverts commit 70faf5fdfbfa0e427b12d4181a9302394974c3cf, reversing changes made to 2307eb84dcd1748cc231719017551111310d1bf9.
* Merge branch 'cs-upgrade-sidekiq' into 'master' Robert Speicher2016-09-211-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+1
| | | | | | | | | | | | | | | | 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-4/+8
|\ \
| * | Use oj gem for faster JSON processingAhmad Sherif2016-09-161-0/+3
| | | | | | | | | | | | | | | | | | It's mainly intended to improve Elasticsearch indexing performance (through multi_json gem), but other gems could benefit from it too, like grape.
| * | Bump rubocop-rspec to 1.7.0Robert Speicher2016-09-151-1/+1
| |/
| * Merge branch 'rs-update-rubocop' into 'master' Rémy Coutable2016-09-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | 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-1/+1
| | |
| * | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-09-141-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | |
| * | | Merge branch '21748-updating-omniauth-facebook' into 'master' Douwe Maan2016-09-141-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | |/ /
| * | | Use haml_lint for views lintingRémy Coutable2016-09-131-0/+1
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-071-4/+1
|\ \ \ | |/ /
| * | Updated gitlab_git to 10.6.3Yorick Peterse2016-09-061-1/+1
| |/ | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+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-1/+1
|
* Merge branch 'rs-update-doorkeeper' into 'master' Robert Speicher2016-08-181-1/+1
|\ | | | | | | | | | | | | Update doorkeeper to 4.2.0 Changelog: https://git.io/v6PnV See merge request !5881
| * Update doorkeeper to 4.2.0Robert Speicher2016-08-181-1/+1
| | | | | | | | Changelog: https://git.io/v6PnV
* | Merge branch 'rs-issue-21017' into 'master' Robert Speicher2016-08-181-1/+1
|\ \ | |/ |/| | | | | | | | | Update Hamlit to 2.6.1 Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017 See merge request !5873
| * Update Hamlit to 2.6.1rs-issue-21017Robert Speicher2016-08-181-1/+1
| | | | | | | | Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
* | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-181-1/+2
|\ \ | | | | | | | | | | | | | | | Support slash commands in issues / MR description & comments See merge request !5021
| * | Make slash commands contextualRémy Coutable2016-08-131-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | Merge branch ↵Jacob Schatz2016-08-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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: ![image](/uploads/486198e273019f8969d2e90560d82928/image.png) 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: ![image](/uploads/6aa0d69b7efdfd6fe6aa22b9a49e9716/image.png) 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
| * | Fix Ace syntax highlighting with compiled assets3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webuiSean McGivern2016-08-171-1/+1
| |/
* | Update gitlab_git gem to 10.4.7Ahmad Sherif2016-08-181-1/+1
| |
* | Add json-schema gem to test groupDouglas Barbosa Alexandre2016-08-171-0/+1
|/
* Upgrade Rails to 4.2.7.1 for security fixes.Connor Shea2016-08-111-1/+1
| | | | 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/
* Merge branch '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master' Rémy Coutable2016-08-111-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Replace the tinder gem by bare HTTP requestsThomas Balthazar2016-08-111-3/+0
| |
* | Update Grape from 0.13.0 to 0.15.0.Connor Shea2016-08-091-1/+1
|/ | | | | | Changelog: https://github.com/ruby-grape/grape/blob/v0.15.0/CHANGELOG.md Works toward #18226.
* Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez2016-08-081-1/+1
|
* Bump gitlab_git to lazy load compare commits14202-compare-lazy-load-commitsPaco Guzman2016-08-051-1/+1
|
View Lorry Controller Status