From 3bdc57f0a710b3769381ecad7ea4098223ecff56 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Sat, 16 Apr 2016 21:09:08 +0200 Subject: Create table for award emoji --- config/initializers/inflections.rb | 4 ++++ config/routes.rb | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 9e8b0131f8f..3d1a41a4652 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -8,3 +8,7 @@ # inflect.irregular 'person', 'people' # inflect.uncountable %w( fish sheep ) # end +# +ActiveSupport::Inflector.inflections do |inflect| + inflect.uncountable %w(award_emoji) +end diff --git a/config/routes.rb b/config/routes.rb index 46a25262844..ecde83d8547 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -639,6 +639,7 @@ Rails.application.routes.draw do post :cancel_merge_when_build_succeeds get :ci_status post :toggle_subscription + post :toggle_award_emoji post :remove_wip end @@ -703,6 +704,7 @@ Rails.application.routes.draw do resources :issues, constraints: { id: /\d+/ } do member do post :toggle_subscription + post :toggle_award_emoji get :referenced_merge_requests get :related_branches end @@ -731,10 +733,7 @@ Rails.application.routes.draw do resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do member do delete :delete_attachment - end - - collection do - post :award_toggle + post :toggle_award_emoji end end -- cgit v1.2.1 From 91a7b9333b660abc866e52e1a614151cb529413d Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Wed, 1 Jun 2016 11:23:09 +0200 Subject: Incorportate feedback --- config/routes.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 85760409c1f..cd28c421fe2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -754,7 +754,6 @@ Rails.application.routes.draw do resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do member do delete :delete_attachment - post :toggle_award_emoji end end -- cgit v1.2.1 From 128549f10beb406333fa23c1693750c06ff7bc4a Mon Sep 17 00:00:00 2001 From: Timothy Andrew Date: Mon, 6 Jun 2016 10:14:51 +0530 Subject: Implement U2F registration. - Move the `TwoFactorAuthsController`'s `new` action to `show`, since the page is not used to create a single "two factor auth" anymore. We can have a single 2FA authenticator app, along with any number of U2F devices, in any combination, so the page will be accessed after the first "two factor auth" is created. - Add the `u2f` javascript library, which provides an API to the browser's U2F implementation. - Add tests for the JS components --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 1fc7985136b..27ab79d68f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -343,8 +343,9 @@ Rails.application.routes.draw do resources :keys resources :emails, only: [:index, :create, :destroy] resource :avatar, only: [:destroy] - resource :two_factor_auth, only: [:new, :create, :destroy] do + resource :two_factor_auth, only: [:show, :create, :destroy] do member do + post :create_u2f post :codes patch :skip end -- cgit v1.2.1 From 8dc1fa0d8dc9106ab95a3039723e9013c4eed00c Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Sat, 4 Jun 2016 00:16:13 +0300 Subject: Updated MR notes. --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 1fc7985136b..9b54b292845 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -757,6 +757,7 @@ Rails.application.routes.draw do resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do member do + post :toggle_award_emoji delete :delete_attachment end end -- cgit v1.2.1 From 0e2f26dd2a10ed876f96b0496dff2de6780eeaea Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Mon, 2 May 2016 18:19:46 -0500 Subject: Prioritize labels functionality --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 7e735541f7f..5aa8a0fe8a5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -719,10 +719,12 @@ Rails.application.routes.draw do resources :labels, constraints: { id: /\d+/ } do collection do post :generate + post :set_sorting end member do post :toggle_subscription + post :toggle_priority end end -- cgit v1.2.1 From d8263b285193d9163089683eb77825f1cd673b14 Mon Sep 17 00:00:00 2001 From: Thijs Wouters Date: Mon, 14 Mar 2016 10:46:26 +0100 Subject: Sort by label priority MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- config/initializers/nulls_last.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 config/initializers/nulls_last.rb (limited to 'config') diff --git a/config/initializers/nulls_last.rb b/config/initializers/nulls_last.rb new file mode 100644 index 00000000000..47b7b0bb3d2 --- /dev/null +++ b/config/initializers/nulls_last.rb @@ -0,0 +1,15 @@ +module ActiveRecord + class Base + def self.nulls_last(field, direction = 'ASC') + if Gitlab::Database.postgresql? + "#{field} #{direction} NULLS LAST" + else + if direction.upcase == 'ASC' + "-#{field} DESC" + else + "#{field} DESC" + end + end + end + end +end -- cgit v1.2.1 From 499bb9f305e78d0e3488c2eee6328ce76af39920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Fri, 13 May 2016 17:26:18 +0200 Subject: Improve Issuable.order_labels_priority MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- config/initializers/nulls_last.rb | 15 --------------- config/routes.rb | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 config/initializers/nulls_last.rb (limited to 'config') diff --git a/config/initializers/nulls_last.rb b/config/initializers/nulls_last.rb deleted file mode 100644 index 47b7b0bb3d2..00000000000 --- a/config/initializers/nulls_last.rb +++ /dev/null @@ -1,15 +0,0 @@ -module ActiveRecord - class Base - def self.nulls_last(field, direction = 'ASC') - if Gitlab::Database.postgresql? - "#{field} #{direction} NULLS LAST" - else - if direction.upcase == 'ASC' - "-#{field} DESC" - else - "#{field} DESC" - end - end - end - end -end diff --git a/config/routes.rb b/config/routes.rb index 5aa8a0fe8a5..93ff825d7b2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -724,7 +724,7 @@ Rails.application.routes.draw do member do post :toggle_subscription - post :toggle_priority + delete :remove_priority end end -- cgit v1.2.1 From fa6593b226ab4eae267a45716dde65b641532674 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Thu, 2 Jun 2016 15:21:15 -0500 Subject: Update method and route --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 93ff825d7b2..240dcc74b06 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -719,7 +719,7 @@ Rails.application.routes.draw do resources :labels, constraints: { id: /\d+/ } do collection do post :generate - post :set_sorting + post :set_priorities end member do -- cgit v1.2.1 From 9442482d091cd4fabd760797aa9455f96e5abbb6 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Sun, 17 Apr 2016 15:56:10 -0600 Subject: Add some gems' licenses not caught by License Finder. Also add License Finder to CI (only runs on master). --- config/.decisions.yml | 89 +++++++++++++++++++++++++++++++++++++++++++++++ config/license_finder.yml | 2 ++ 2 files changed, 91 insertions(+) create mode 100644 config/.decisions.yml create mode 100644 config/license_finder.yml (limited to 'config') diff --git a/config/.decisions.yml b/config/.decisions.yml new file mode 100644 index 00000000000..7e4a8be6c48 --- /dev/null +++ b/config/.decisions.yml @@ -0,0 +1,89 @@ +--- +- - :whitelist + - MIT + - :who: + :why: + :versions: [] + :when: 2016-04-17 21:12:24.558441000 Z +- - :ignore_group + - development + - :who: + :why: + :versions: [] + :when: 2016-04-17 21:27:01.054140000 Z +- - :ignore_group + - test + - :who: + :why: + :versions: [] + :when: 2016-04-17 21:27:06.250326000 Z +- - :license + - raphael-rails + - MIT + - :who: + :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt + :versions: [] + :when: 2016-04-17 21:30:07.575392000 Z +- - :license + - rouge + - MIT + - :who: + :why: https://github.com/jneen/rouge/blob/master/LICENSE + :versions: [] + :when: 2016-04-17 21:31:29.490394000 Z +- - :license + - pyu-ruby-sasl + - MIT + - :who: + :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE + :versions: [] + :when: 2016-04-17 21:41:55.266420000 Z +- - :license + - six + - MIT + - :who: + :why: https://github.com/randx/six/blob/master/LICENSE + :versions: [] + :when: 2016-04-17 21:42:31.420186000 Z +- - :license + - rdoc + - GPLv2 + - :who: + :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc + :versions: [] + :when: 2016-04-17 21:43:30.480413000 Z +- - :license + - rubypants + - unknown + - :who: + :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc + :versions: [] + :when: 2016-04-17 21:44:49.443453000 Z +- - :license + - expression_parser + - MIT + - :who: + :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE + :versions: [] + :when: 2016-04-17 21:45:41.829912000 Z +- - :license + - ace-rails-ap + - MIT + - :who: + :why: https://github.com/codykrieger/ace-rails-ap/blob/master/LICENSE + :versions: [] + :when: 2016-04-17 21:46:19.767922000 Z +- - :license + - jquery-scrollto-rails + - MIT, GPLv2 + - :who: + :why: https://github.com/JohnColvin/jquery-scrollto-rails/blob/master/MIT%20License + :versions: [] + :when: 2016-04-17 21:47:56.967946000 Z +- - :license + - creole + - ruby + - :who: + :why: https://github.com/minad/creole#license + :versions: [] + :when: 2016-04-17 21:49:10.329759000 Z diff --git a/config/license_finder.yml b/config/license_finder.yml new file mode 100644 index 00000000000..d641563719f --- /dev/null +++ b/config/license_finder.yml @@ -0,0 +1,2 @@ +--- +decisions_file: './config/.decisions.yml' -- cgit v1.2.1 From ddca2806c754b9be86138dfeddb4b581d9b6a40f Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Sun, 1 May 2016 23:59:43 -0600 Subject: Add gems and licenses that were previously missing. Approve a number of licenses after a bunch of research today. --- config/.decisions.yml | 123 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/.decisions.yml b/config/.decisions.yml index 7e4a8be6c48..9cfc9a186bb 100644 --- a/config/.decisions.yml +++ b/config/.decisions.yml @@ -47,18 +47,11 @@ :when: 2016-04-17 21:42:31.420186000 Z - - :license - rdoc - - GPLv2 + - ruby - :who: :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc :versions: [] :when: 2016-04-17 21:43:30.480413000 Z -- - :license - - rubypants - - unknown - - :who: - :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc - :versions: [] - :when: 2016-04-17 21:44:49.443453000 Z - - :license - expression_parser - MIT @@ -87,3 +80,117 @@ :why: https://github.com/minad/creole#license :versions: [] :when: 2016-04-17 21:49:10.329759000 Z +- - :license + - eventmachine + - ruby + - :who: + :why: https://github.com/eventmachine/eventmachine/blob/master/LICENSE + :versions: [] + :when: 2016-04-17 21:49:10.329759001 Z +- - :whitelist + - Apache 2.0 + - :who: Connor Shea + :why: http://choosealicense.com/licenses/apache-2.0/ + :versions: [] + :when: 2016-05-02 05:27:43.762702000 Z +- - :blacklist + - GPLv2 + - :who: Connor Shea + :why: GPL-licensed libraries cannot be linked to from non-GPL projects. + :versions: [] + :when: 2016-05-02 05:29:27.637336000 Z +- - :blacklist + - GPLv3 + - :who: Connor Shea + :why: GPL-licensed libraries cannot be linked to from non-GPL projects. + :versions: [] + :when: 2016-05-02 05:29:43.904715000 Z +- - :whitelist + - ruby + - :who: Connor Shea + :why: https://github.com/ruby/ruby/blob/ruby_1_8_6/COPYING + :versions: [] + :when: 2016-05-02 05:31:54.498490000 Z +- - :whitelist + - LGPL + - :who: Connor Shea + :why: http://www.gnu.org/licenses/license-list.html#LGPLv2.1 + :versions: [] + :when: 2016-05-02 05:32:48.645841000 Z +- - :whitelist + - ISC + - :who: Connor Shea + :why: http://www.gnu.org/licenses/license-list.html#ISC + :versions: [] + :when: 2016-05-02 05:42:01.894452000 Z +- - :whitelist + - New BSD + - :who: Connor Shea + :why: https://opensource.org/licenses/BSD-3-Clause + :versions: [] + :when: 2016-05-02 05:44:38.246021000 Z +- - :license + - unicorn + - ruby + - :who: + :why: + :versions: [] + :when: 2016-05-02 05:45:28.817510000 Z +- - :license + - unicorn-worker-killer + - ruby + - :who: + :why: + :versions: [] + :when: 2016-05-02 05:45:38.323867000 Z +- - :license + - json + - ruby + - :who: + :why: + :versions: [] + :when: 2016-05-02 05:50:07.826564000 Z +- - :license + - unf + - BSD + - :who: + :why: + :versions: [] + :when: 2016-05-02 05:51:46.886872000 Z +- - :whitelist + - LGPL-2.1+ + - :who: + :why: Equivalent to LGPL. + :versions: [] + :when: 2016-05-02 05:52:56.303239000 Z +- - :whitelist + - BSD + - :who: + :why: https://opensource.org/licenses/BSD-2-Clause + :versions: [] + :when: 2016-05-02 05:55:09.796363000 Z +- - :license + - rubypants + - MIT + - :who: + :why: + :versions: [] + :when: 2016-05-02 05:56:50.696858000 Z +- - :ignore + - bundler + - :who: + :why: + :versions: [] + :when: 2016-05-02 06:41:31.504230000 Z +- - :heed + - bundler + - :who: + :why: + :versions: [] + :when: 2016-05-02 06:41:38.703526000 Z +- - :ignore + - bundler + - :who: + :why: Bundler is MIT licensed but will sometimes fail in CI. + :versions: [] + :when: 2016-05-02 06:42:08.045090000 Z -- cgit v1.2.1 From 4cff270f20cbf09641b3c65086a769f684cf8755 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Thu, 2 Jun 2016 11:08:59 -0600 Subject: Fix up all the decisions in the YML file. --- config/.decisions.yml | 211 +++++++++++++++++++++++--------------------------- 1 file changed, 96 insertions(+), 115 deletions(-) (limited to 'config') diff --git a/config/.decisions.yml b/config/.decisions.yml index 9cfc9a186bb..2327b2d17a1 100644 --- a/config/.decisions.yml +++ b/config/.decisions.yml @@ -1,196 +1,177 @@ --- -- - :whitelist - - MIT - - :who: - :why: - :versions: [] - :when: 2016-04-17 21:12:24.558441000 Z +# IGNORED GROUPS AND GEMS - - :ignore_group - development - - :who: - :why: + - :who: Connor Shea + :why: Development gems are not distributed with the final product and are therefore exempt. :versions: [] :when: 2016-04-17 21:27:01.054140000 Z - - :ignore_group - test - - :who: - :why: + - :who: Connor Shea + :why: Test gems are not distributed with the final product and are therefore exempt. :versions: [] :when: 2016-04-17 21:27:06.250326000 Z +- - :ignore + - bundler + - :who: Connor Shea + :why: Bundler is MIT licensed but will sometimes fail in CI. + :versions: [] + :when: 2016-05-02 06:42:08.045090000 Z + +# LICENSE WHITELIST +- - :whitelist + - MIT + - :who: Connor Shea + :why: Compatible with itself. + :versions: [] + :when: 2016-04-17 21:12:24.558441000 Z +- - :whitelist + - Apache 2.0 + - :who: Connor Shea + :why: http://choosealicense.com/licenses/apache-2.0/ + :versions: [] + :when: 2016-05-02 05:27:43.762702000 Z +- - :whitelist + - ruby + - :who: Connor Shea + :why: https://github.com/ruby/ruby/blob/ruby_1_8_6/COPYING + :versions: [] + :when: 2016-05-02 05:31:54.498490000 Z +- - :whitelist + - LGPL + - :who: Connor Shea + :why: http://www.gnu.org/licenses/license-list.html#LGPLv2.1 + :versions: [] + :when: 2016-05-02 05:32:48.645841000 Z +- - :whitelist + - ISC + - :who: Connor Shea + :why: http://www.gnu.org/licenses/license-list.html#ISC + :versions: [] + :when: 2016-05-02 05:42:01.894452000 Z +- - :whitelist + - New BSD + - :who: Connor Shea + :why: https://opensource.org/licenses/BSD-3-Clause + :versions: [] + :when: 2016-05-02 05:44:38.246021000 Z +- - :whitelist + - LGPL-2.1+ + - :who: Connor Shea + :why: Equivalent to LGPL. + :versions: [] + :when: 2016-05-02 05:52:56.303239000 Z +- - :whitelist + - BSD + - :who: Connor Shea + :why: https://opensource.org/licenses/BSD-2-Clause + :versions: [] + :when: 2016-05-02 05:55:09.796363000 Z + +# LICENSE BLACKLIST +- - :blacklist + - GPLv2 + - :who: Connor Shea + :why: GPL-licensed libraries cannot be linked to from non-GPL projects. + :versions: [] + :when: 2016-05-02 05:29:27.637336000 Z +- - :blacklist + - GPLv3 + - :who: Connor Shea + :why: GPL-licensed libraries cannot be linked to from non-GPL projects. + :versions: [] + :when: 2016-05-02 05:29:43.904715000 Z + +# GEM LICENSES - - :license - raphael-rails - MIT - - :who: + - :who: Connor Shea :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt :versions: [] :when: 2016-04-17 21:30:07.575392000 Z - - :license - rouge - MIT - - :who: + - :who: Connor Shea :why: https://github.com/jneen/rouge/blob/master/LICENSE :versions: [] :when: 2016-04-17 21:31:29.490394000 Z - - :license - pyu-ruby-sasl - MIT - - :who: + - :who: Connor Shea :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE :versions: [] :when: 2016-04-17 21:41:55.266420000 Z - - :license - six - MIT - - :who: + - :who: Connor Shea :why: https://github.com/randx/six/blob/master/LICENSE :versions: [] :when: 2016-04-17 21:42:31.420186000 Z - - :license - rdoc - ruby - - :who: + - :who: Connor Shea :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc :versions: [] :when: 2016-04-17 21:43:30.480413000 Z - - :license - expression_parser - MIT - - :who: + - :who: Connor Shea :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE :versions: [] :when: 2016-04-17 21:45:41.829912000 Z -- - :license - - ace-rails-ap - - MIT - - :who: - :why: https://github.com/codykrieger/ace-rails-ap/blob/master/LICENSE - :versions: [] - :when: 2016-04-17 21:46:19.767922000 Z -- - :license - - jquery-scrollto-rails - - MIT, GPLv2 - - :who: - :why: https://github.com/JohnColvin/jquery-scrollto-rails/blob/master/MIT%20License - :versions: [] - :when: 2016-04-17 21:47:56.967946000 Z - - :license - creole - ruby - - :who: + - :who: Connor Shea :why: https://github.com/minad/creole#license :versions: [] :when: 2016-04-17 21:49:10.329759000 Z - - :license - eventmachine - ruby - - :who: + - :who: Connor Shea :why: https://github.com/eventmachine/eventmachine/blob/master/LICENSE :versions: [] :when: 2016-04-17 21:49:10.329759001 Z -- - :whitelist - - Apache 2.0 - - :who: Connor Shea - :why: http://choosealicense.com/licenses/apache-2.0/ - :versions: [] - :when: 2016-05-02 05:27:43.762702000 Z -- - :blacklist - - GPLv2 - - :who: Connor Shea - :why: GPL-licensed libraries cannot be linked to from non-GPL projects. - :versions: [] - :when: 2016-05-02 05:29:27.637336000 Z -- - :blacklist - - GPLv3 - - :who: Connor Shea - :why: GPL-licensed libraries cannot be linked to from non-GPL projects. - :versions: [] - :when: 2016-05-02 05:29:43.904715000 Z -- - :whitelist - - ruby - - :who: Connor Shea - :why: https://github.com/ruby/ruby/blob/ruby_1_8_6/COPYING - :versions: [] - :when: 2016-05-02 05:31:54.498490000 Z -- - :whitelist - - LGPL - - :who: Connor Shea - :why: http://www.gnu.org/licenses/license-list.html#LGPLv2.1 - :versions: [] - :when: 2016-05-02 05:32:48.645841000 Z -- - :whitelist - - ISC - - :who: Connor Shea - :why: http://www.gnu.org/licenses/license-list.html#ISC - :versions: [] - :when: 2016-05-02 05:42:01.894452000 Z -- - :whitelist - - New BSD - - :who: Connor Shea - :why: https://opensource.org/licenses/BSD-3-Clause - :versions: [] - :when: 2016-05-02 05:44:38.246021000 Z - - :license - unicorn - ruby - - :who: - :why: + - :who: Connor Shea + :why: http://unicorn.bogomips.org/LICENSE.html :versions: [] :when: 2016-05-02 05:45:28.817510000 Z - - :license - unicorn-worker-killer - ruby - - :who: - :why: + - :who: Connor Shea + :why: https://github.com/kzk/unicorn-worker-killer/blob/master/LICENSE :versions: [] :when: 2016-05-02 05:45:38.323867000 Z - - :license - json - ruby - - :who: - :why: + - :who: Connor Shea + :why: https://github.com/flori/json/tree/master#license :versions: [] :when: 2016-05-02 05:50:07.826564000 Z - - :license - unf - BSD - - :who: - :why: + - :who: Connor Shea + :why: https://github.com/knu/ruby-unf/blob/master/LICENSE :versions: [] :when: 2016-05-02 05:51:46.886872000 Z -- - :whitelist - - LGPL-2.1+ - - :who: - :why: Equivalent to LGPL. - :versions: [] - :when: 2016-05-02 05:52:56.303239000 Z -- - :whitelist - - BSD - - :who: - :why: https://opensource.org/licenses/BSD-2-Clause - :versions: [] - :when: 2016-05-02 05:55:09.796363000 Z - - :license - rubypants - - MIT - - :who: - :why: + - BSD + - :who: Connor Shea + :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc :versions: [] :when: 2016-05-02 05:56:50.696858000 Z -- - :ignore - - bundler - - :who: - :why: - :versions: [] - :when: 2016-05-02 06:41:31.504230000 Z -- - :heed - - bundler - - :who: - :why: - :versions: [] - :when: 2016-05-02 06:41:38.703526000 Z -- - :ignore - - bundler - - :who: - :why: Bundler is MIT licensed but will sometimes fail in CI. - :versions: [] - :when: 2016-05-02 06:42:08.045090000 Z -- cgit v1.2.1 From 3c3234121575ce271f8b50f3dcf1880db328fed1 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Thu, 2 Jun 2016 12:04:19 -0600 Subject: Add Licensing information and guidelines to the Documentation. --- config/.decisions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/.decisions.yml b/config/.decisions.yml index 2327b2d17a1..273796f3912 100644 --- a/config/.decisions.yml +++ b/config/.decisions.yml @@ -23,7 +23,7 @@ - - :whitelist - MIT - :who: Connor Shea - :why: Compatible with itself. + :why: http://choosealicense.com/licenses/mit/ :versions: [] :when: 2016-04-17 21:12:24.558441000 Z - - :whitelist -- cgit v1.2.1 From 7900c035bf3f0cf96740227aebadbb3cad276ba0 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Mon, 6 Jun 2016 10:34:44 -0600 Subject: Resolve feedback. --- config/.decisions.yml | 177 ---------------------------------------- config/dependency_decisions.yml | 177 ++++++++++++++++++++++++++++++++++++++++ config/license_finder.yml | 2 +- 3 files changed, 178 insertions(+), 178 deletions(-) delete mode 100644 config/.decisions.yml create mode 100644 config/dependency_decisions.yml (limited to 'config') diff --git a/config/.decisions.yml b/config/.decisions.yml deleted file mode 100644 index 273796f3912..00000000000 --- a/config/.decisions.yml +++ /dev/null @@ -1,177 +0,0 @@ ---- -# IGNORED GROUPS AND GEMS -- - :ignore_group - - development - - :who: Connor Shea - :why: Development gems are not distributed with the final product and are therefore exempt. - :versions: [] - :when: 2016-04-17 21:27:01.054140000 Z -- - :ignore_group - - test - - :who: Connor Shea - :why: Test gems are not distributed with the final product and are therefore exempt. - :versions: [] - :when: 2016-04-17 21:27:06.250326000 Z -- - :ignore - - bundler - - :who: Connor Shea - :why: Bundler is MIT licensed but will sometimes fail in CI. - :versions: [] - :when: 2016-05-02 06:42:08.045090000 Z - -# LICENSE WHITELIST -- - :whitelist - - MIT - - :who: Connor Shea - :why: http://choosealicense.com/licenses/mit/ - :versions: [] - :when: 2016-04-17 21:12:24.558441000 Z -- - :whitelist - - Apache 2.0 - - :who: Connor Shea - :why: http://choosealicense.com/licenses/apache-2.0/ - :versions: [] - :when: 2016-05-02 05:27:43.762702000 Z -- - :whitelist - - ruby - - :who: Connor Shea - :why: https://github.com/ruby/ruby/blob/ruby_1_8_6/COPYING - :versions: [] - :when: 2016-05-02 05:31:54.498490000 Z -- - :whitelist - - LGPL - - :who: Connor Shea - :why: http://www.gnu.org/licenses/license-list.html#LGPLv2.1 - :versions: [] - :when: 2016-05-02 05:32:48.645841000 Z -- - :whitelist - - ISC - - :who: Connor Shea - :why: http://www.gnu.org/licenses/license-list.html#ISC - :versions: [] - :when: 2016-05-02 05:42:01.894452000 Z -- - :whitelist - - New BSD - - :who: Connor Shea - :why: https://opensource.org/licenses/BSD-3-Clause - :versions: [] - :when: 2016-05-02 05:44:38.246021000 Z -- - :whitelist - - LGPL-2.1+ - - :who: Connor Shea - :why: Equivalent to LGPL. - :versions: [] - :when: 2016-05-02 05:52:56.303239000 Z -- - :whitelist - - BSD - - :who: Connor Shea - :why: https://opensource.org/licenses/BSD-2-Clause - :versions: [] - :when: 2016-05-02 05:55:09.796363000 Z - -# LICENSE BLACKLIST -- - :blacklist - - GPLv2 - - :who: Connor Shea - :why: GPL-licensed libraries cannot be linked to from non-GPL projects. - :versions: [] - :when: 2016-05-02 05:29:27.637336000 Z -- - :blacklist - - GPLv3 - - :who: Connor Shea - :why: GPL-licensed libraries cannot be linked to from non-GPL projects. - :versions: [] - :when: 2016-05-02 05:29:43.904715000 Z - -# GEM LICENSES -- - :license - - raphael-rails - - MIT - - :who: Connor Shea - :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt - :versions: [] - :when: 2016-04-17 21:30:07.575392000 Z -- - :license - - rouge - - MIT - - :who: Connor Shea - :why: https://github.com/jneen/rouge/blob/master/LICENSE - :versions: [] - :when: 2016-04-17 21:31:29.490394000 Z -- - :license - - pyu-ruby-sasl - - MIT - - :who: Connor Shea - :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE - :versions: [] - :when: 2016-04-17 21:41:55.266420000 Z -- - :license - - six - - MIT - - :who: Connor Shea - :why: https://github.com/randx/six/blob/master/LICENSE - :versions: [] - :when: 2016-04-17 21:42:31.420186000 Z -- - :license - - rdoc - - ruby - - :who: Connor Shea - :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc - :versions: [] - :when: 2016-04-17 21:43:30.480413000 Z -- - :license - - expression_parser - - MIT - - :who: Connor Shea - :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE - :versions: [] - :when: 2016-04-17 21:45:41.829912000 Z -- - :license - - creole - - ruby - - :who: Connor Shea - :why: https://github.com/minad/creole#license - :versions: [] - :when: 2016-04-17 21:49:10.329759000 Z -- - :license - - eventmachine - - ruby - - :who: Connor Shea - :why: https://github.com/eventmachine/eventmachine/blob/master/LICENSE - :versions: [] - :when: 2016-04-17 21:49:10.329759001 Z -- - :license - - unicorn - - ruby - - :who: Connor Shea - :why: http://unicorn.bogomips.org/LICENSE.html - :versions: [] - :when: 2016-05-02 05:45:28.817510000 Z -- - :license - - unicorn-worker-killer - - ruby - - :who: Connor Shea - :why: https://github.com/kzk/unicorn-worker-killer/blob/master/LICENSE - :versions: [] - :when: 2016-05-02 05:45:38.323867000 Z -- - :license - - json - - ruby - - :who: Connor Shea - :why: https://github.com/flori/json/tree/master#license - :versions: [] - :when: 2016-05-02 05:50:07.826564000 Z -- - :license - - unf - - BSD - - :who: Connor Shea - :why: https://github.com/knu/ruby-unf/blob/master/LICENSE - :versions: [] - :when: 2016-05-02 05:51:46.886872000 Z -- - :license - - rubypants - - BSD - - :who: Connor Shea - :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc - :versions: [] - :when: 2016-05-02 05:56:50.696858000 Z diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml new file mode 100644 index 00000000000..a49d805e4f9 --- /dev/null +++ b/config/dependency_decisions.yml @@ -0,0 +1,177 @@ +--- +# IGNORED GROUPS AND GEMS +- - :ignore_group + - development + - :who: Connor Shea + :why: Development gems are not distributed with the final product and are therefore exempt. + :versions: [] + :when: 2016-04-17 21:27:01.054140000 Z +- - :ignore_group + - test + - :who: Connor Shea + :why: Test gems are not distributed with the final product and are therefore exempt. + :versions: [] + :when: 2016-04-17 21:27:06.250326000 Z +- - :ignore + - bundler + - :who: Connor Shea + :why: Bundler is MIT licensed but will sometimes fail in CI. + :versions: [] + :when: 2016-05-02 06:42:08.045090000 Z + +# LICENSE WHITELIST +- - :whitelist + - MIT + - :who: Connor Shea + :why: http://choosealicense.com/licenses/mit/ + :versions: [] + :when: 2016-04-17 21:12:24.558441000 Z +- - :whitelist + - Apache 2.0 + - :who: Connor Shea + :why: http://choosealicense.com/licenses/apache-2.0/ + :versions: [] + :when: 2016-05-02 05:27:43.762702000 Z +- - :whitelist + - ruby + - :who: Connor Shea + :why: https://github.com/ruby/ruby/blob/ruby_2_1/COPYING + :versions: [] + :when: 2016-05-02 05:31:54.498490000 Z +- - :whitelist + - LGPL + - :who: Connor Shea + :why: http://www.gnu.org/licenses/license-list.html#LGPLv2.1 + :versions: [] + :when: 2016-05-02 05:32:48.645841000 Z +- - :whitelist + - ISC + - :who: Connor Shea + :why: http://www.gnu.org/licenses/license-list.html#ISC + :versions: [] + :when: 2016-05-02 05:42:01.894452000 Z +- - :whitelist + - New BSD + - :who: Connor Shea + :why: https://opensource.org/licenses/BSD-3-Clause + :versions: [] + :when: 2016-05-02 05:44:38.246021000 Z +- - :whitelist + - LGPL-2.1+ + - :who: Connor Shea + :why: Equivalent to LGPL. + :versions: [] + :when: 2016-05-02 05:52:56.303239000 Z +- - :whitelist + - BSD + - :who: Connor Shea + :why: https://opensource.org/licenses/BSD-2-Clause + :versions: [] + :when: 2016-05-02 05:55:09.796363000 Z + +# LICENSE BLACKLIST +- - :blacklist + - GPLv2 + - :who: Connor Shea + :why: GPL-licensed libraries cannot be linked to from non-GPL projects. + :versions: [] + :when: 2016-05-02 05:29:27.637336000 Z +- - :blacklist + - GPLv3 + - :who: Connor Shea + :why: GPL-licensed libraries cannot be linked to from non-GPL projects. + :versions: [] + :when: 2016-05-02 05:29:43.904715000 Z + +# GEM LICENSES +- - :license + - raphael-rails + - MIT + - :who: Connor Shea + :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt + :versions: [] + :when: 2016-04-17 21:30:07.575392000 Z +- - :license + - rouge + - MIT + - :who: Connor Shea + :why: https://github.com/jneen/rouge/blob/master/LICENSE + :versions: [] + :when: 2016-04-17 21:31:29.490394000 Z +- - :license + - pyu-ruby-sasl + - MIT + - :who: Connor Shea + :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE + :versions: [] + :when: 2016-04-17 21:41:55.266420000 Z +- - :license + - six + - MIT + - :who: Connor Shea + :why: https://github.com/randx/six/blob/master/LICENSE + :versions: [] + :when: 2016-04-17 21:42:31.420186000 Z +- - :license + - rdoc + - ruby + - :who: Connor Shea + :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc + :versions: [] + :when: 2016-04-17 21:43:30.480413000 Z +- - :license + - expression_parser + - MIT + - :who: Connor Shea + :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE + :versions: [] + :when: 2016-04-17 21:45:41.829912000 Z +- - :license + - creole + - ruby + - :who: Connor Shea + :why: https://github.com/minad/creole#license + :versions: [] + :when: 2016-04-17 21:49:10.329759000 Z +- - :license + - eventmachine + - ruby + - :who: Connor Shea + :why: https://github.com/eventmachine/eventmachine/blob/master/LICENSE + :versions: [] + :when: 2016-04-17 21:49:10.329759001 Z +- - :license + - unicorn + - ruby + - :who: Connor Shea + :why: http://unicorn.bogomips.org/LICENSE.html + :versions: [] + :when: 2016-05-02 05:45:28.817510000 Z +- - :license + - unicorn-worker-killer + - ruby + - :who: Connor Shea + :why: https://github.com/kzk/unicorn-worker-killer/blob/master/LICENSE + :versions: [] + :when: 2016-05-02 05:45:38.323867000 Z +- - :license + - json + - ruby + - :who: Connor Shea + :why: https://github.com/flori/json/tree/master#license + :versions: [] + :when: 2016-05-02 05:50:07.826564000 Z +- - :license + - unf + - BSD + - :who: Connor Shea + :why: https://github.com/knu/ruby-unf/blob/master/LICENSE + :versions: [] + :when: 2016-05-02 05:51:46.886872000 Z +- - :license + - rubypants + - BSD + - :who: Connor Shea + :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc + :versions: [] + :when: 2016-05-02 05:56:50.696858000 Z diff --git a/config/license_finder.yml b/config/license_finder.yml index d641563719f..e01ebec3298 100644 --- a/config/license_finder.yml +++ b/config/license_finder.yml @@ -1,2 +1,2 @@ --- -decisions_file: './config/.decisions.yml' +decisions_file: './config/dependency_decisions.yml' -- cgit v1.2.1 From d485ec9f1c7bf00a3c87e3e91b6a306f234a5232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Thu, 2 Jun 2016 16:47:39 -0400 Subject: Instrument `RepositoryCheck::SingleRepositoryWorker` manually This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware. --- config/initializers/metrics.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config') diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 0c788714714..2673093b96a 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -121,6 +121,13 @@ if Gitlab::Metrics.enabled? config.instrument_instance_methods(Gitlab::GitAccessWiki) config.instrument_instance_methods(API::Helpers) + + config.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker) + # Iterate over each non-super private instance method to keep up to date if + # internals change + RepositoryCheck::SingleRepositoryWorker.private_instance_methods(false).each do |method| + config.instrument_instance_method(RepositoryCheck::SingleRepositoryWorker, method) + end end GC::Profiler.enable -- cgit v1.2.1 From 5bb3e1934c2a059c8e7cdc4ecbe597781f502a3e Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 7 Jun 2016 10:14:18 -0700 Subject: Add LGPLv2 to license whiltelist --- config/dependency_decisions.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index a49d805e4f9..436a2c5e17a 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -175,3 +175,9 @@ :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc :versions: [] :when: 2016-05-02 05:56:50.696858000 Z +- - :whitelist + - LGPLv2+ + - :who: Stan Hu + :why: Equivalent to LGPLv2 + :versions: [] + :when: 2016-06-07 17:14:10.907682000 Z -- cgit v1.2.1