Commit Graph
844 Commits
Author SHA1 Message Date
Douwe MaanandRobert Speicher ba48ed8630 Merge branch 'update-mail_room-to-0.8.0' into 'master'
Update mail_room to 0.8.0 to resolve #13357

Update mail_room to 0.8.0 to resolve #13357

Which includes the fix from:
https://github.com/tpitale/mail_room/pull/73

See merge request !4835
2016-06-21 19:41:28 -04:00
Robert SpeicherandRobert Speicher 6e654c2f98 Merge branch 'update-browser-gem' into 'master'
Update browser gem to 2.2.0

A user with a certain browser would hit an Error 500:

```
ArgumentError: invalid value for Float(): "0."
  from browser/accept_language.rb:45:in `Float'
  from browser/accept_language.rb:45:in `quality'
  from browser/accept_language.rb:15:in `each'
  from browser/accept_language.rb:15:in `sort_by'
  from browser/accept_language.rb:15:in `parse'
  from browser/base.rb:13:in `initialize'
  from browser.rb:125:in `new'
  from browser.rb:125:in `block in new'
  from browser.rb:125:in `map'
  from browser.rb:125:in `new'
  from browser/action_controller.rb:15:in `browser'
  from abstract_controller/helpers.rb:67:in `browser'
  from app/views/layouts/_head.html.haml:38:in `_app_views_layouts__head_html_haml__1626593241142487258_59224880'
```

The root cause when the `Accept-Language` header would contain a float for the quality value (e.g. en-GB,en;q=0.v5).

Fixes https://github.com/fnando/browser/issues/241

Seen today via Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/7644/

See merge request !4811
2016-06-21 15:22:18 -04:00
Douwe MaanandRobert Speicher bf0294378e Merge branch 'feature/project-export' into 'master'
Export project functionality

This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects.

- [x] members
- DB data
  - [x] issues
  - [x] issue comments
  - [x] merge requests
  - [x] merge request diff
  - [x] merge request comments
  - [x] labels
  - [x] milestones
  - [x] snippets
  - [x] releases
  - [x] events
  - [x] commit statuses
  - [x] CI builds
- File system data
  - [x] Git repository
  - [x] wiki
  - [x] uploads
  - [ ] ~~CI build traces~~
  - [ ] ~~CI build artifacts~~
  - [ ] ~~LFS objects~~
- DB configuration
  - [x] services
  - [x] web hooks
  - [x] protected branches
  - [x] deploy keys
  - [x] CI variables
  - [x] CI triggers

See merge request !3114
2016-06-17 14:18:15 -04:00
Robert SpeicherandRobert Speicher 3ca1518469 Merge branch 'bump-gitlab-git-10.2.0' into 'master'
Use gitlab-git 10.2.0

Closes #18741

See merge request !4722
2016-06-16 20:36:36 -04:00
Jacob SchatzandRobert Speicher 386faaa735 Merge branch 'network-assets' into 'master'
Replace raphael-rails with raphael.js and split it from the rest of the JS

## What does this MR do?

Removes raphael.js and its related libraries from the default JS bundle.

It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it.

This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB.

## Are there points in the code the reviewer needs to double check?

That tests pass and that there aren't errors on any pages (especially the Network page).

## Why was this MR needed?

It's only used on the Network page and was using way too much bandwidth for just one page.

## What are the relevant issue numbers?

#14372 #13165 

Follow-up to !4394 and !4516.

cc: @jschatz1 

See merge request !4519
2016-06-15 20:56:33 -04:00
Kamil Trzcinski 1b62b86fdd Merge remote-tracking branch 'origin/master' into artifacts-expire-date 2016-06-14 11:38:44 +02:00
Kamil TrzcinskiandPhil Hughes aea4041ce9 Allow to expire build artifacts 2016-06-13 11:01:19 +01:00
Connor Shea f395ed242a Update brakeman from 3.2.1 to 3.3.2
Removes a few dependencies.

Changelog: https://github.com/presidentbeef/brakeman/blob/master/CHANGES
2016-06-12 18:25:21 -06:00
Rémy Coutable 722211cddf Merge branch 'support-fog-azure' into 'master'
Add fog-azure to supported backup list

!4396 left out Azure by accident.


See merge request !4444
2016-06-08 14:18:31 +00:00
Stan Hu f4beec8a90 Add Azure to supported backup list (left out accidentally) 2016-06-07 14:16:37 -07:00
Stan Hu 405d752b9b Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
Closes #18210
2016-06-07 13:32:29 -07:00
Kamil Trzcinski 88b0a9efc4 Load knapsack in Rakefile only when is bundled 2016-06-07 20:02:03 +02:00
Kamil Trzcinski 0b4981e771 Merge remote-tracking branch 'origin/master' into knapsack
# Conflicts:
#	.gitlab-ci.yml
2016-06-07 10:29:43 +02:00
Rémy Coutable 9e256de4ac Merge branch 'license-finder-gem' into 'master'
License finder gem

Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license.

https://github.com/pivotal/LicenseFinder

See also: gitlab-com/operations#164

See merge request !3775
2016-06-07 08:06:17 +00:00
Stan Hu 8f28dc950a Bump rouge to 1.11.0 2016-06-06 20:55:37 -07:00
Connor Shea b51b14507c Add License Finder gem.
In order to rehost all our gems in our own gem host, we need to have the legal rights to do so for every gem should they be taken down from RubyGems. License Finder automates checking of gems to ensure that we're in the clear legally.

Approved the MIT License because it essentially allows us to do "whatever" with those gems.

I am not a lawyer.

https://github.com/pivotal/LicenseFinder
2016-06-06 13:39:36 -06:00
Timothy Andrew e5823f3609 Update the browser gem.
- Need the `mobile?` detection (that the new version provides) for the
  U2F registration/ authentication flow
2016-06-06 12:50:31 +05:30
Timothy Andrew 791cc9138b Add a U2fRegistrations table/model.
- To hold registrations from U2F devices, and to authenticate them.
- Previously, `User#two_factor_enabled` was aliased to the
  `otp_required_for_login` column on `users`.
- This commit changes things a bit:
    - `User#two_factor_enabled` is not a method anymore
    - `User#two_factor_enabled?` checks both the
      `otp_required_for_login` column, as well as `U2fRegistration`s
    - Change all instances of `User#two_factor_enabled` to
      `User#two_factor_enabled?`
- Add the `u2f` gem, and implement registration/authentication at the
  model level.
2016-06-06 12:50:31 +05:30
Connor Shea 903946c78a Replace colorize gem with rainbow.
Colorize is a gem licensed under the GPLv2, so we can’t use it in GitLab without relicensing GitLab under the terms of the GPL. Rainbow is licensed under the MIT license and does the exact same thing as Colorize, so Rainbow was added in place of Colorize.

The syntax is slightly different for Rainbow vs. Colorize, and was updated in accordance.

The gem is still a dependency of Spinach, so it’s included in the development/test environments, but won’t be packaged with the actual product, and therefore doesn’t require we relicense the product.

An attempt at relicensing Colorize was made, but didn’t succeed as the library owner never responded.

Rainbow library: https://github.com/sickill/rainbow
Relevant issue regarding licensing in GitLab's gems: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3775
2016-06-03 10:37:09 -06:00
Kamil Trzcinski 95c3a927b3 Use knapsack 1.11.0 2016-06-03 17:15:00 +02:00
Kamil Trzcinski 77f8deec2c Use own version of knapsack which supports spinach tests 2016-06-03 17:08:18 +02:00
Kamil Trzcinski 0a1fccb2ed Try to use knapsack 2016-06-03 17:08:17 +02:00
Robert Speicher e6389dfee6 Merge branch 'reduce-fog-deps' into 'master'
Reduce number of fog gem dependencies

Currently supported:

* AWS
* Azure
* OpenStack
* Google
* local storage

Closes #15352

See merge request !4396
2016-06-02 16:35:42 +00:00
Robert Speicher 7d33fba7af Merge branch 'upgrade-devise-two-factor' into 'master'
Upgrade devise, devise-two-factor, and attr_encrypted

Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support.

attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future.

See merge request !4216
2016-06-02 00:44:41 +00:00
Stan Hu e5bb417cde Reduce number of fog gem dependencies
Closes #15352
2016-06-01 11:51:26 -07:00
Connor Shea 7f4f959e9b Upgrade Kaminari from 0.16.3 to 0.17.0.
Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170

Deprecates num_pages in favor of total_pages and includes Rails 5 support.
2016-05-31 14:14:16 -06:00
Connor Shea d287315dbf Upgrade attr_encrypted and encryptor
attr_encrypted (1.3.4 => 3.0.1) Changelog:
https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.m
d

attr_encrypted 2.x included a vulnerability, so that major version is
skipped. 3.x requires that the algorithm and mode used by each
encrypted attribute is specified explicitly.

`nil` is no longer a valid value for the encrypted_value_iv field, so
it’s changed to a randomly generated string.
2016-05-30 13:51:21 -06:00
Connor Shea d47b2b92c9 Upgrade devise and devise-two-factor, remove devise-async
Devise (3.5.4 => 4.1.1) Changelog:
https://github.com/plataformatec/devise/blob/master/CHANGELOG.md

devise-two-factor (2.0.1 => 3.0.0) Changelog:
https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md

These are reliant on each other, so they have to be upgraded together.

devise-async is no longer necessary as Devise 4.1 fixes a bug with the
ActiveJob integration.
2016-05-30 13:51:21 -06:00
Jacob Schatz 3d009f7785 Merge branch 'updated-contrib-calendar' into 'master'
POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944
2016-05-25 23:29:41 +00:00
Connor Shea ee0d3abcb8 Update state_machines-activerecord from 0.3.0 to 0.4.0.
No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master

Includes Rails 5 support.
2016-05-25 15:17:53 -06:00
Robert Speicher 43d9e06b68 Add rubocop-rspec
Almost all cops are starting as disabled until we can fix their
violations.
2016-05-23 15:59:32 -04:00
Robert Speicher 6898087b97 Update rubocop to 0.40.0 2016-05-23 14:03:04 -04:00
Connor Shea a5954080e9 Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0.
Changelog: https://github.com/rails/activerecord-session_store/releases/tag/v1.0.0

Includes Rails 5 support.
2016-05-19 21:08:07 -05:00
Phil Hughes c3de944040 Removed cal heatmap from gemfile 2016-05-16 12:22:17 +01:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Douwe Maan 710ebf164f Merge branch 'remove-deprecated-finders' into 'master'
Remove activerecord-deprecated_finders gem

We don’t use any of the deprecated finders, so it should be safe to remove.

See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information.

Resolves #17015.

See merge request !3981
2016-05-13 20:49:38 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route'
# Conflicts:
#	db/schema.rb
2016-05-12 16:39:03 -05:00
Connor Shea b42f39d2c2 Remove activerecord-deprecated_finders gem
We don’t use any of the deprecated finders, so it should be safe to
remove.

Resolves #17015.
2016-05-10 18:38:08 -06:00
Connor Shea 976a70522f Removes jquery-scrollto-rails.
Instead the script is now included directly from the vendor directory.

Resolves #17166.
2016-05-10 18:31:36 -06:00
Alfredo Sumaran 53568da9ed Update Ace Editor 2016-05-10 13:59:05 -05:00
DJ Mountney 67dc3b9c11 Add the health_check gem end expose the health_check route 2016-05-10 08:24:09 -07:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Jeroen van Baarsen f1479b56b7 Remove the annotate gem and delete old annotations
In 8278b763d9 the default behaviour of annotation
has changes, which was causing a lot of noise in diffs. We decided in #17382
that it is better to get rid of the whole annotate gem, and instead let people
look at schema.rb for the columns in a table.

Fixes: #17382
2016-05-09 18:00:28 +02:00
Douwe Maan 1c65019742 Merge branch 'stanhu/gitlab-ce-bump-mailroom' 2016-05-05 14:34:04 +02:00
Rémy Coutable 275c615557 Merge branch 'revert-devise-async' into 'master'
Revert "Remove the Devise Async gem."

This reverts commit 1cc614f2bd.

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-04 13:55:00 +00:00
Connor Shea 3004386b55 Revert "Remove the Devise Async gem."
This reverts commit 1cc614f2bd.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
2016-05-03 15:43:51 -06:00
Kamil Trzcinski 105017c308 Added JWT controller 2016-05-02 13:29:17 +02:00
Connor Shea 66d7acfe4d Update rspec-rails from 3.3.3 to 3.4.2.
This allows the removal of the monkey patch from this commit: 47ff1c5608

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-05-01 13:44:50 -06:00
Stan Hu 6243a83411 Bump mail_room to 0.7.0 to fix stuck IDLE connections
Closes #13357
2016-04-30 22:36:26 -07:00
Kamil Trzcinski f41a3e24d2 Added authentication service for docker registry 2016-04-29 16:45:00 +02:00