878 Commits
Author SHA1 Message Date
Rémy Coutable df97d5514e Merge branch 'fix_gemfile' into 'master'
Fix gemfile

1. replace `"` to `'` in Gemfile.

2. change `require: nil` to `require: false`.
`require: nil` and `require: false` get same result, but i think we shouldn't write it differently in other places.

3. set version for gems.
better gem's version control for prevent dependency errors.

See merge request !5078
2016-07-08 16:54:57 +00:00
Robert Speicher cfb5a76bb2 Merge branch 'upgrade-oauth2' into 'master'
Upgrade oauth2 from 1.0.0 to 1.2.0.

Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0

Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.

Adds support for Rails 5. Working toward #14286.

See merge request !5041
2016-07-07 23:53:57 +00:00
Robert Speicher aefb8a1741 Merge branch 'update-gemoji' into 'master'
Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione

- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.

Spring Update changes! http://emojione.com/releases/#2.2.0

See merge request !4919
2016-07-05 17:08:35 +00:00
Robert Speicher 38533a2f42 Merge branch 'upgrade-doorkeeper' into 'master'
Upgrade Doorkeeper from 3.1.0 to 4.0.0.

Includes Rails 5 support and various bug fixes. Working toward #14286.

Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400

See merge request !5055
2016-07-05 13:48:48 +00:00
bogdanvlviv bfccdab709 set version for gems.
better gem's version control for prevent dependency errors.
2016-07-04 22:52:37 +03:00
bogdanvlviv 59eeac2962 change require: nil to require: false
require: nil and require: false get same result, but i think we shouldn't write it differently in other places.
2016-07-04 22:51:19 +03:00
bogdanvlviv 589a9caf0a replace " to ' in Gemfile 2016-07-04 22:51:19 +03:00
Robert Speicher e09bdd7843 Merge branch 'upgrade-rspec-rails' into 'master'
Upgrade rspec-rails from 3.4.2 to 3.5.0.

Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286 

Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/

See merge request !5051
2016-07-04 16:17:36 +00:00
Takuya Noguchi b686338898 Update RedCloth to 4.3.2 for CVE-2012-6684 2016-07-03 12:23:19 +09:00
Connor Shea d500ce9d33 Upgrade Doorkeeper from 3.1.0 to 4.0.0.
Includes Rails 5 support and various bug fixes.

Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
2016-07-01 15:34:27 -06:00
Robert Speicher d9edea9735 Merge branch 'upgrade-thin' into 'master'
Upgrade Thin from 1.6.1 to 1.7.0.

Includes support for Rack 2. Working toward #14286.

Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG

See merge request !5047
2016-07-01 16:17:54 +00:00
Connor Shea 3c2236cbe1 Upgrade rspec-rails from 3.4.2 to 3.5.0.
Also upgrade its dependencies. Includes Rails 5 support.

Changelogs:
rspec-rails: https://github.com/rspec/rspec-rails/compare/v3.4.2...v3.5.0
rspec-core: https://github.com/rspec/rspec-core/compare/v3.4.0...v3.5.0
rspec-support: https://github.com/rspec/rspec-support/compare/v3.4.0...v3.5.0
rspec-expectations: https://github.com/rspec/rspec-expectations/compare/v3.4.0...v3.5.0
rspec-mocks: https://github.com/rspec/rspec-mocks/compare/v3.4.0...v3.5.0
rspec: https://github.com/rspec/rspec/compare/v3.4.0...v3.5.0
2016-07-01 10:08:51 -06:00
Connor Shea fb056c78a7 Upgrade Thin from 1.6.1 to 1.7.0.
Includes support for Rack 2.

Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG
2016-07-01 09:34:02 -06:00
Connor Shea c231178a7e Upgrade oauth2 from 1.0.0 to 1.2.0.
Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0

Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.
2016-07-01 07:53:45 -06:00
Connor Shea eb70f051a6 Remove quiet_assets in favor of built-in sprockets-rails config.
quiet_assets has been seemingly abandoned, and now sprockets-rails has the feature built-in!

From this PR: https://github.com/rails/sprockets-rails/pull/355
2016-06-30 16:18:05 -06:00
Dmitriy Zaporozhets 1c2e7af6af Merge branch 'issue-18886' into 'master'
Loop all disks when displaying system info. Closes #18886



See merge request !4983
2016-06-30 12:56:59 +00:00
Z.J. van de Weg 7a2f25a80d Remove coveralls as its unused 2016-06-30 10:59:41 +02:00
Connor Shea f31f78cea3 Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.
No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier.

Also fix the Rake task and update gemojione to 2.6.1. This adds the EmojiOne Spring update.

Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md
2016-06-29 14:53:09 -06:00
Josh Frye 98238a27c7 Loop all disks when displaying system info 2016-06-29 16:02:12 -04:00
jbub 49edb2e0f9 Add fog-rackspace microgem to support backups using rackspace provider. 2016-06-29 09:26:35 +02:00
Josh Frye 13ba3bd4fd Use number_to_human_size for system info and remove dependency on Filesize gem. 2016-06-28 21:35:42 -04:00
Josh Frye 82edef9414 Show basic system info on admin panel. Closes #18886 2016-06-28 21:35:42 -04:00
Patricio Cano c8cf159d14 Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-saml 2016-06-27 10:37:54 -05:00
Connor Shea 83a9e82ff6 Upgrade sentry-raven from 0.15.6 to 1.1.0.
Changelog: https://github.com/getsentry/raven-ruby/releases
2016-06-24 10:43:20 -06:00
Connor Shea 262f902d9a Restrict hamlit version, remove coffeescript filters. 2016-06-23 15:54:23 -06:00
connorshea 80f576bb8a Replace Haml with Hamlit.
Hamlit is a library that's faster than Haml while implementing most of its features: https://github.com/k0kubun/hamlit

Not sure if this breaks anything, but as far as I can tell most things work the same. No obvious regressions that I've been able to find.
2016-06-22 16:09:51 -06:00
Douwe Maan 0909535ef7 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 22:58:14 +00:00
Lin Jen-Shin 835e3b0ac6 Update mail_room to 0.8.0 to resolve #13357
Which includes the fix from:
https://github.com/tpitale/mail_room/pull/73
2016-06-21 16:47:29 +00:00
Stan Hu 2302b2c131 Update browser gem to 2.2.0
Fixes https://github.com/fnando/browser/issues/241
2016-06-20 15:08:29 -07:00
Douwe Maan 9b7fd74805 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 15:35:27 +00:00
Stan Hu 91253a3afd Use gitlab-git 10.2.0 2016-06-16 15:56:39 -07:00
James Lopez b3a0a1c315 fixed merge conflicts on UI branch 2016-06-16 15:01:27 +02:00
Jacob Schatz 1a832c8f00 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 21:11:31 +00:00
Kamil Trzcinski 1b62b86fdd Merge remote-tracking branch 'origin/master' into artifacts-expire-date 2016-06-14 11:38:44 +02:00
James Lopez e83fc684a5 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts:
#	Gemfile.lock
#	app/helpers/todos_helper.rb
#	app/models/todo.rb
#	app/views/projects/edit.html.haml
#	lib/gitlab/import_export/import_service.rb
2016-06-13 14:00:19 +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
Connor Shea 18e16e427d Replace raphael-rails with raphael.js so it can be split from the rest of the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently. 2016-06-10 09:28:07 -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