From 2c0f97cd1e99abdf7c80e2c79ed55b321bf5fb7b Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 14 Oct 2016 13:15:29 +0100 Subject: Includes page specific JS --- config/application.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 946b632b0e8..fb84870dfbd 100644 --- a/config/application.rb +++ b/config/application.rb @@ -94,6 +94,7 @@ module Gitlab config.assets.precompile << "cycle_analytics/cycle_analytics_bundle.js" config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js" config.assets.precompile << "boards/test_utils/simulate_drag.js" + config.assets.precompile << "environments/environments_bundle.js" config.assets.precompile << "blob_edit/blob_edit_bundle.js" config.assets.precompile << "snippet/snippet_bundle.js" config.assets.precompile << "lib/utils/*.js" -- cgit v1.2.1 From d4726112656df24ff7721865a96237d5168466f7 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Mon, 24 Oct 2016 15:24:56 +0100 Subject: added cycle analytics events controller and started integration spec --- config/routes/project.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 9cf8465dca8..ed595c777f5 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -153,6 +153,12 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: resource :cycle_analytics, only: [:show] + namespace :cycle_analytics do + scope :events, controller: '/projects/cycle_analytics/events' do + get :issues + end + end + resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do collection do post :cancel_all -- cgit v1.2.1 From 32679232635dbd0d196a91d0788ee1135ff56b43 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Mon, 24 Oct 2016 15:49:25 +0100 Subject: added the rest of the stages to the controller and relevant specs --- config/routes/project.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index ed595c777f5..7e0536b464f 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -155,7 +155,13 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: namespace :cycle_analytics do scope :events, controller: '/projects/cycle_analytics/events' do - get :issues + get :issue + get :plan + get :code + get :test + get :review + get :staging + get :production end end -- cgit v1.2.1 From cbc9f0cd1aa9f379952b6e4d3ad6df9971f9092a Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 16 Nov 2016 09:58:23 +0100 Subject: fix issue with commits and also updated routes --- config/routes/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 7e0536b464f..d6eae1c9fce 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -154,7 +154,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: resource :cycle_analytics, only: [:show] namespace :cycle_analytics do - scope :events, controller: '/projects/cycle_analytics/events' do + scope :events, controller: 'events' do get :issue get :plan get :code -- cgit v1.2.1 From 283c3df8003780f34937851d0bd7d3ec1ae6ca84 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 18 Nov 2016 17:38:01 +0200 Subject: Improve consistency of empty todo list messages - They all now end with punctuation - Not everyone enjoys, or can even drink, coffee - The "High five!" message had no context for why we were high-fiving - "Henceforth" is one word [ci skip] --- config/no_todos_messages.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/no_todos_messages.yml b/config/no_todos_messages.yml index 8372fb4ebe9..264a975b614 100644 --- a/config/no_todos_messages.yml +++ b/config/no_todos_messages.yml @@ -1,13 +1,11 @@ -# When the Todos list on the user's dashboard becomes empty, one of the messages below shows up randomly. +# When the todo list on the user's dashboard becomes empty, a random message +# from the list below will be shown. # # If you come up with a fun one, please feel free to contribute it to GitLab! # https://about.gitlab.com/contributing/ - --- - Good job! Looks like you don't have any todos left. -- Coffee really tastes better without any todos left. -- Isn't an empty To Do list beautiful? -- Time for a rewarding coffee break +- Isn't an empty todo list beautiful? - Give yourself a pat on the back! -- High five! -- Hence forth you shall be known as 'Todo Destroyer' \ No newline at end of file +- Nothing left to do, high five! +- Henceforth you shall be known as "Todo Destroyer". -- cgit v1.2.1 From fd05e26618dd0c123ca476b6f5a3d85f1cfe397a Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Tue, 11 Oct 2016 14:25:17 +0200 Subject: Precalculate user's authorized projects in database Closes #23150 --- config/sidekiq_queues.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index f3531dd30a5..69136b73946 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -35,6 +35,7 @@ - [clear_database_cache, 1] - [delete_user, 1] - [delete_merged_branches, 1] + - [authorized_projects, 1] - [expire_build_instance_artifacts, 1] - [group_destroy, 1] - [irker, 1] -- cgit v1.2.1 From e14bb160ac8756d663a1397de4482f02fd738e1e Mon Sep 17 00:00:00 2001 From: Brian Neel Date: Fri, 18 Nov 2016 13:45:52 -0500 Subject: Add logging for rack attack events --- config/initializers/rack_attack_logging.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 config/initializers/rack_attack_logging.rb (limited to 'config') diff --git a/config/initializers/rack_attack_logging.rb b/config/initializers/rack_attack_logging.rb new file mode 100644 index 00000000000..8bb9ea29c33 --- /dev/null +++ b/config/initializers/rack_attack_logging.rb @@ -0,0 +1,7 @@ +# Adds logging for all Rack Attack blocks and throttling events. + +ActiveSupport::Notifications.subscribe('rack.attack') do |name, start, finish, request_id, req| + if [:throttle, :blacklist].include? req.env['rack.attack.match_type'] + Rails.logger.info("Rack_Attack: #{req.env['rack.attack.match_type']} #{req.ip} #{req.request_method} #{req.fullpath}") + end +end -- cgit v1.2.1 From beb638ca0379472eb15f840249321cdaca7bf5be Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 21 Nov 2016 12:41:44 +0200 Subject: Fix 404 on some group pages when name contains dot Signed-off-by: Dmitriy Zaporozhets --- config/routes/group.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/routes/group.rb b/config/routes/group.rb index 068e0b6e843..a3a001178b4 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -14,7 +14,9 @@ end resources :groups, only: [:index, :new, :create] -scope(path: 'groups/:id', controller: :groups) do +scope(path: 'groups/:id', + controller: :groups, + constraints: { id: Gitlab::Regex.namespace_route_regex }) do get :edit, as: :edit_group get :issues, as: :issues_group get :merge_requests, as: :merge_requests_group @@ -22,7 +24,10 @@ scope(path: 'groups/:id', controller: :groups) do get :activity, as: :activity_group end -scope(path: 'groups/:group_id', module: :groups, as: :group) do +scope(path: 'groups/:group_id', + module: :groups, + as: :group, + constraints: { group_id: Gitlab::Regex.namespace_route_regex }) do resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do post :resend_invite, on: :member delete :leave, on: :collection @@ -37,4 +42,4 @@ scope(path: 'groups/:group_id', module: :groups, as: :group) do end # Must be last route in this file -get 'groups/:id' => 'groups#show', as: :group_canonical +get 'groups/:id' => 'groups#show', as: :group_canonical, constraints: { id: Gitlab::Regex.namespace_route_regex } -- cgit v1.2.1