Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-04Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan
# Conflicts: # Gemfile.lock
2016-05-04Merge branch 'revert-devise-async' into 'master' Rémy Coutable
Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. Resolves #17250. See merge request !4027
2016-05-04Revert "Remove the Devise Async gem."Connor Shea
This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
2016-05-01Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea
This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
2016-04-29Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher
Upgrade Doorkeeper from 2.2.2 to 3.1.0 I’d rather upgrade one major version at a time, so Doorkeeper needs to be upgraded to 3.x before it can be upgraded to 4.x (which includes Rails 5 support). Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310 Working toward #14286. See merge request !3644
2016-04-29Support supressing text file diffs on the default branch with .gitattributesMatt Oakes
This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG
2016-04-29API support for the 'since' and 'until' operators on commit requestsPaco Guzman
- Parameter validation as ISO8601 format
2016-04-28Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea
I’d rather upgrade one major version at a time, so Doorkeeper needs to be upgraded to 3.x before it can be upgraded to 4.x (which includes Rails 5 support). Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310
2016-04-27Merge branch 'rs-letter_opener_web' into 'master' Dmitriy Zaporozhets
Add letter_opener_web gem Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route. See merge request !3893
2016-04-26Remove the Devise Async gem.Connor Shea
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
2016-04-26Merge branch 'upgrade-gitlab-grit' into 'master' Robert Speicher
Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency. Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc Resolves #15101. See merge request !3901
2016-04-25Merge branch 'update-jquery-rails' into 'master' Robert Speicher
Upgrade jQuery Rails from 4.0.5 to 4.1.1 Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: - https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md - https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ - https://github.com/rails/jquery-ujs/releases See merge request !3642
2016-04-25Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version ↵Connor Shea
dependency. Resolves #15101.
2016-04-24Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates.Luke Howell
2016-04-23Merge branch 'upgrade-sidekiq' into 'master' Robert Speicher
Update Sidekiq and related gems (bundle update sidekiq) Closes #15079 See merge request !3817
2016-04-22Add letter_opener_web gemRobert Speicher
Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route.
2016-04-20Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher
License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
2016-04-19Update Sidekiq and related gems (bundle update sidekiq)Stan Hu
Closes #15079
2016-04-18Update octokit gem to version 4.3.0Douglas Barbosa Alexandre
2016-04-18Update to licensee 8.0.0 and fix API specsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov
endpoint
2016-04-12Update spring and spring-commands-spinachRobert Speicher
Spring changelog: https://git.io/vVAUY
2016-04-11Upgrade jQuery Rails from 4.0.5 to 4.1.1connorshea
Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ https://github.com/rails/jquery-ujs/releases
2016-04-11Merge branch 'upgrade-annotate' into 'master' Robert Speicher
Upgrade annotate from 2.6.10 to 2.7.0 We don’t have any tests for this, so no need to run them. [ci skip] Includes compatibility with Rails 5. Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286. See merge request !3645
2016-04-11Upgrade annotate from 2.6.10 to 2.7.0connorshea
Includes compatibility with Rails 5. We don’t have any tests for this, so no need to run them. [ci skip] Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286.
2016-04-10Upgrade premailer-rails from 1.9.0 to 1.9.2connorshea
Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19 2 Working towards #14286.
2016-04-09Upgrade Sprockets from 3.3.5 to 3.6.0.connorshea
Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Resolves #14344.
2016-04-09Merge branch 'rs-update-rails' into 'master' Robert Speicher
Bump rails to 4.2.6 See merge request !3424
2016-04-09Merge branch 'redis-connection-pool' into 'master' Robert Speicher
Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
2016-04-07Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2connorshea
This removes a few dependencies! It was also rude to be using coveralls 0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also paves the way for updating mime-types to 3.0. Coveralls Changelog: https://github.com/lemurheavy/coveralls-ruby/releases Simplecov Changelog: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md
2016-04-06Make redis an explicit Gemfile dependencyJacob Vosmaer
2016-04-05Merge branch 'upgrade-bundler-audit' into 'master' Robert Speicher
Upgrade bundler-audit from 0.4.0 to 0.5.0 Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)). See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28 See merge request !3433
2016-04-05Bump rails to 4.2.6Robert Speicher
2016-04-04Cache Banzai projects/objects using RequestStoreYorick Peterse
This was originally suggested by @ayufan and modified to be a bit cleaner and use RequestStore instead of a regular Hash. By caching the output of the two methods involved the number of queries is reduced significantly. For example, for an issue with 200 notes (of which 100 reference a number of merge requests) this cuts down the amount of queries from around 6300 to around 3300.
2016-03-31Merge branch 'upgrade-coffee-rails' into 'master' Robert Speicher
Upgrade coffee-rails to 4.1.1 Includes Rails 5 support. [See Changelog for more info](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md#411-dece mber-18-2015). Working towards #14286. See merge request !3398
2016-03-29Upgrade bundler-audit from 0.4.0 to 0.5.0connorshea
Bundler Audit can now run check with the `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI. See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2 015-02-28
2016-03-28Merge branch 'upgrade-web-console' into 'master' Robert Speicher
Upgrade web-console to 2.3.0 Rails 5 compatibility release. [See the Changelog for more information](https://github.com/rails/web-console/releases/tag/v2.3.0). Working towards #14286. See merge request !3400
2016-03-27Merge branch 'upgrade-font-awesome' into 'master' Robert Speicher
Upgrade font-awesome-rails to 4.5.0.1 Includes Rails 5 support. [See Changelog for details](https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1). Working towards #14286. See merge request !3399
2016-03-27Merge branch 'upgrade-brakeman' into 'master' Robert Speicher
Upgrade Brakeman from 3.1.4 to 3.2.1 Includes support for Rails 5, bug fixes, and various additional vulnerability checks. [See Changelog for more information](https://github.com/presidentbeef/brakeman/blob/master/CHANGES). Working towards #14286. See merge request !3397
2016-03-27Merge branch 'upgrade-teaspoon' into 'master' Robert Speicher
Upgrade Teaspoon from 1.0.1 to 1.1.5. Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md). Working towards #14286. See merge request !3409
2016-03-26Upgrade Teaspoon from 1.0.1 to 1.1.5.connorshea
Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
2016-03-25Upgrade coffee-rails from 4.1.0 to 4.1.1connorshea
Includes Rails 5 support. See Changelog for more info (https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md#411-dece mber-18-2015)
2016-03-25Upgrade Brakeman from 3.1.4 to 3.2.1connorshea
Includes support for Rails 5, bug fixes, and various additional vulnerability checks. See Changelog for more information (https://github.com/presidentbeef/brakeman/blob/master/CHANGES)
2016-03-25Upgrade web-console to 2.3.0connorshea
Rails 5 compatibility release. See the Changelog for more information: https://github.com/rails/web-console/releases/tag/v2.3.0
2016-03-25Upgrade font-awesome-rails to 4.5.0.1connorshea
Includes Rails 5 support. See changelog for details: https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1
2016-03-25Upgrade Bullet to 5.0.0connorshea
Includes Rails 5 support. See changelog for details (https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
2016-03-22Merge branch 'master' into issue_12658Douwe Maan
# Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
2016-03-21Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable
Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318
2016-03-21Update Rubocop from 0.35.1 to 0.38.0.connorshea
Discussed in #14233. See [their releases](https://github.com/bbatsov/rubocop/releases) for more info. Changes: - Enable DisplayCopNames for lint output. - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`. - Enabling Rails cops changed to new syntax. - Remove StyleGuides and move Descriptions to comments. - Add missing cops. - Add TODOs for cops that should be enabled in the future. - Set TargetRubyVersion to 2.1.
2016-03-20Merge branch 'master' into issue_12658Douwe Maan