home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,704 Commits 48 Branches 340 Tags
6ce25e7b4caa9e94de74378729178c7060d640b2
Commit Graph
1029 Commits
Author SHA1 Message Date
Douwe Maan 95cb0195b0 Merge branch '18593-update-rinku' into 'master' 
Bump Rinku to 2.0.0

## What does this MR do?

Update Rinku gem to last stable version.

## What are the relevant issue numbers?

#18593 

## 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 !5064
 2016-07-05 21:51:41 +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
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
Kamil Trzcinski 1854a7a065 Update spring to 1.7.2 to fix hanging rails console 2016-07-04 14:25:47 +02:00
Paco Guzman 00aac15c6f Bump Rinku to 2.0.0 2016-07-04 12:25:09 +02:00
Robert Speicher 4b0bd4f828 Merge branch 'downgrade-redis-3-2-2' into 'master' 
Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq

This affects GitLab 8.8 and 8.9. See:
    
* https://github.com/mperham/sidekiq/blob/master/Changes.md#413
* https://gitlab.com/gitlab-org/gitlab-ce/issues/19441

See merge request !5056
 2016-07-03 18:18:59 +00:00
Takuya Noguchi b686338898 Update RedCloth to 4.3.2 for CVE-2012-6684 2016-07-03 12:23:19 +09:00
Stan Hu 26525064a8 Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq 
See:

https://github.com/mperham/sidekiq/blob/master/Changes.md#413
https://gitlab.com/gitlab-org/gitlab-ce/issues/19441
 2016-07-01 19:46:08 -07: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 0ccdc631e6 Merge branch 'upgrade-sidekiq' into 'master' 
Upgrade Sidekiq from 4.1.2 to 4.1.4.

Adds a dependency on Sinatra and allows Sinatra 2 for eventual support of Rack 2.

Changelog: https://github.com/mperham/sidekiq/blob/master/Changes.md#414

Working toward #14286. 

See merge request !5044
 2016-07-01 20:55:13 +00:00
Robert Speicher 62730e5431 Merge branch 'upgrade-seedfu' into 'master' 
Upgrade seed-fu from 2.3.5 to 2.3.6

Adds Rails 5 support. Working toward #14286.

Changelog: https://github.com/mbleigh/seed-fu/blob/master/CHANGELOG.md#version-236

See merge request !5042
 2016-07-01 20:53:06 +00:00
Robert Speicher f89a3349c0 Merge branch 'upgrade-sass-rails' into 'master' 
Upgrade sass-rails

## What does this MR do?

Upgrades sass-rails from 5.0.4 to 5.0.5. Includes support for Rails 5.

Changelog: https://github.com/rails/sass-rails/releases

Working toward #14286 

See merge request !5030
 2016-07-01 20:52:10 +00: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 44544b3481 Upgrade Sidekiq from 4.1.2 to 4.1.4. 
Adds a dependency on Sinatra and allows Sinatra 2 for eventual support of Rack 2.

Changelog: https://github.com/mperham/sidekiq/blob/master/Changes.md#414
 2016-07-01 08:02:04 -06:00
Connor Shea 1586846790 Upgrade seed-fu from 2.3.5 to 2.3.6 
Adds Rails 5 support.

Changelog: https://github.com/mbleigh/seed-fu/blob/master/CHANGELOG.md#version-236
 2016-07-01 07:57:01 -06:00
Connor Shea 8f7cde0f61 Upgrade sass-rails. 
Upgrade sass-rails from 5.0.4 to 5.0.5. Includes support for Rails 5.

Changelog: https://github.com/rails/sass-rails/releases
 2016-06-30 16:30:16 -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
Connor Shea 44230e12bb Upgrade Sprockets and Sprockets Rails. 
Upgrade Sprockets from 3.6.0 to 3.6.2.

Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md

Upgrade Sprockets Rails from 3.0.4 to 3.1.1.

Changelog: https://github.com/rails/sprockets-rails/compare/v3.0.4...v3.1.1
 2016-06-30 16:11:57 -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
Robert Speicher 9e43fc151b Merge branch 'hamlit-test' into 'master' 
Replace Haml with Hamlit

What this change does:
- It replaces HAML with [Hamlit](https://github.com/k0kubun/hamlit), a much more efficient implementation of HAML.
- It removes `haml-rails`.
- It adds `hamlit.rb` and removes `haml.rb`.
- It makes things faster and less memory-hungry!

See also #13201.

See merge request !3666
 2016-06-23 23:51:08 +00:00
Connor Shea 262f902d9a Restrict hamlit version, remove coffeescript filters. 2016-06-23 15:54:23 -06:00
Stan Hu 2237c8883f Bump gitlab_git to 10.2.3 2016-06-23 12:53:00 -07:00
Stan Hu b80275f5ff Bump gitlab_git to 10.2.1 to fix false truncated warnings with ISO-8559 files 
Closes #18690
 2016-06-23 11:12:31 -07: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 Vosmaer 18d4bd9564 Use gitlab_git 10.1.4 2016-06-16 13:20:12 +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
Douwe Maan a95f8b9a82 Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative' 2016-06-15 15:56:02 +02:00
Yorick Peterse 82090d291f Update the allocations Gem to 1.0.5 
This allows it to be used on Ruby 2.3 without it crashing all the time.
 2016-06-14 18:09:06 +02:00
Kamil Trzcinski 1b62b86fdd Merge remote-tracking branch 'origin/master' into artifacts-expire-date 2016-06-14 11:38:44 +02:00
James Lopez d6adfe0418 fix gemfile 2016-06-13 14:05:08 +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
Stan Hu 0fdfd2dd6e Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark 
Here was the problem:

1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
2. If the blob is text, GitLab will attempt to display it.
3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.

To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
an update to gitlab_git: gitlab-org/gitlab_git!86

Closes #13826
 2016-06-12 07:36:25 -07:00