home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,914 Commits 48 Branches 340 Tags
ae25c19ee5dcfae8ea977b2014657ecc6c3eaf3d
Commit Graph
938 Commits
Author SHA1 Message Date
Yorick Peterse 6e47a1924b Updated gitlab_git to 10.1.0 2016-05-05 19:46:26 +02:00
Stan Hu 280ea4f600 Upgrade Sidekiq to 4.1.2 2016-05-05 09:17:46 -07:00
Douwe Maan 1c65019742 Merge branch 'stanhu/gitlab-ce-bump-mailroom' 2016-05-05 14:34:04 +02:00
Douwe Maan 6a8359f3d3 Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits' 
# Conflicts:
#	Gemfile.lock
 2016-05-04 17:27:47 +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
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
Robert Speicher 47698071d9 Merge branch 'upgrade-doorkeeper' into 'master' 
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-29 18:13:50 +00:00
Matt Oakes 28dcdb2779 Support supressing text file diffs on the default branch with .gitattributes 
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-29 12:45:15 +01:00
Paco Guzman c4b9bd0413 API support for the 'since' and 'until' operators on commit requests 
- Parameter validation as ISO8601 format
 2016-04-29 09:26:52 +02:00
connorshea a94b71c301 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
 2016-04-28 11:43:39 -06:00
Dmitriy Zaporozhets 47d269c1aa Merge branch 'rs-letter_opener_web' into 'master' 
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-27 13:23:40 +00:00
Connor Shea 1cc614f2bd Remove the Devise Async gem. 
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.

Resolves #15575.
 2016-04-26 10:41:48 -06:00
Robert Speicher 6ff740ff94 Merge branch 'upgrade-gitlab-grit' into 'master' 
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-25 22:26:13 +00:00
Robert Speicher c295f0d2cc Merge branch 'update-jquery-rails' into 'master' 
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-25 16:12:08 +00:00
Connor Shea 49961bff66 Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency. 
Resolves #15101.
 2016-04-24 16:34:57 -06:00
Luke Howell 2dd4f796b1 Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. 2016-04-24 14:14:29 -05:00
Robert Speicher b1adff828c Merge branch 'upgrade-sidekiq' into 'master' 
Update Sidekiq and related gems (bundle update sidekiq)

Closes #15079

See merge request !3817
 2016-04-22 23:03:07 +00:00
Robert Speicher 702380f1ae 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.
 2016-04-22 16:13:59 -04:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master' 
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 2016-04-20 01:38:49 +00:00
Stan Hu 60b5b22241 Update Sidekiq and related gems (bundle update sidekiq) 
Closes #15079
 2016-04-19 05:44:44 -07:00
Douglas Barbosa Alexandre 5f39729c19 Update octokit gem to version 4.3.0 2016-04-18 17:02:40 -03:00
Rémy Coutable 2f18c77e1b Update to licensee 8.0.0 and fix API specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Anton DavydovandRémy Coutable 073c3d15c7 Initial implementation if license template selector and /licenses/:key API endpoint 2016-04-18 14:47:50 +02:00
Robert Speicher 42a391f744 Update spring and spring-commands-spinach 
Spring changelog: https://git.io/vVAUY
 2016-04-12 14:28:07 -04:00
connorshea a153a1d6fb 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
 2016-04-10 21:57:42 -06:00
Robert Speicher ca7fa51065 Merge branch 'upgrade-annotate' into 'master' 
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-11 03:23:03 +00:00
connorshea a7e1638b43 Upgrade annotate from 2.6.10 to 2.7.0 
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-10 15:14:57 -06:00
connorshea 94b48d9557 Upgrade premailer-rails from 1.9.0 to 1.9.2 
Includes compatibility with Rails 5.

Changelog:
https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19
2

Working towards #14286.
 2016-04-10 14:36:31 -06:00
connorshea 1647e3e884 Upgrade Sprockets from 3.3.5 to 3.6.0. 
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-09 08:29:57 -06:00
Robert Speicher 955d027d17 Merge branch 'rs-update-rails' into 'master' 
Bump rails to 4.2.6

See merge request !3424
 2016-04-09 04:07:48 +00:00
Robert Speicher 93571c4335 Merge branch 'redis-connection-pool' into 'master' 
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-08 22:26:53 +00:00
connorshea 50ef9fcafb Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2 
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-06 23:54:28 -06:00
Jacob Vosmaer 3137f61a55 Make redis an explicit Gemfile dependency 2016-04-06 10:49:57 +02:00
Robert Speicher c61fe24529 Merge branch 'upgrade-bundler-audit' into 'master' 
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-05 17:40:52 +00:00
Robert Speicher 5ff9d2a182 Bump rails to 4.2.6 2016-04-05 13:07:53 -04:00
Yorick Peterse 57bde0ce65 Cache Banzai projects/objects using RequestStore 
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-04-04 10:44:35 +02:00
Robert Speicher 605eae85ba Merge branch 'upgrade-coffee-rails' into 'master' 
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-31 00:56:38 +00:00
connorshea aa97720a93 Upgrade bundler-audit from 0.4.0 to 0.5.0 
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-28 16:43:42 -06:00
Robert Speicher ccf50e81b7 Merge branch 'upgrade-web-console' into 'master' 
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-27 22:23:42 +00:00
Robert Speicher a6a7a5ddd7 Merge branch 'upgrade-font-awesome' into 'master' 
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-27 20:41:35 +00:00
Robert Speicher db0da43a46 Merge branch 'upgrade-brakeman' into 'master' 
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-27 20:39:59 +00:00
Robert Speicher f7a9fc9cf8 Merge branch 'upgrade-teaspoon' into 'master' 
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-27 20:38:26 +00:00
connorshea e664d95437 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).
 2016-03-25 15:48:13 -06:00
connorshea f784393213 Upgrade coffee-rails from 4.1.0 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)
 2016-03-25 12:54:40 -06:00
connorshea f967d5cf3d 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)
 2016-03-24 21:48:06 -06:00
connorshea 2fe8da0b50 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
 2016-03-24 21:29:12 -06:00
connorshea 057244b4c0 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
 2016-03-24 20:28:24 -06:00
connorshea 8d2ded95c8 Upgrade Bullet to 5.0.0 
Includes Rails 5 support. See changelog for details
(https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
 2016-03-24 20:21:32 -06:00