From 601f50c6421f135b52f737a3b59baa32e6a8f1fd Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 27 Mar 2017 11:22:43 +0200 Subject: Add endpoint that returns a list of deployments that happened within last 8.hours add index created_at --- config/routes/project.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 823e0614aeb..39144b74629 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -168,6 +168,8 @@ constraints(ProjectUrlConstrainer.new) do collection do get :folder, path: 'folders/:id' end + + resources :deployments, only: [:index] end resource :cycle_analytics, only: [:show] -- cgit v1.2.3 From c504b88f07f03d381e7b2e22a129413319508413 Mon Sep 17 00:00:00 2001 From: Alexander Randa Date: Thu, 20 Apr 2017 08:31:37 +0000 Subject: Implement ability to update hooks --- config/routes/admin.rb | 6 ++++-- config/routes/project.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 52ba10604d4..48993420ed9 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -50,8 +50,10 @@ namespace :admin do resources :deploy_keys, only: [:index, :new, :create, :destroy] - resources :hooks, only: [:index, :create, :destroy] do - get :test + resources :hooks, only: [:index, :create, :edit, :update, :destroy] do + member do + get :test + end end resources :broadcast_messages, only: [:index, :edit, :create, :update, :destroy] do diff --git a/config/routes/project.rb b/config/routes/project.rb index 115ae2324b3..71fc84a7a12 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -185,7 +185,7 @@ constraints(ProjectUrlConstrainer.new) do end end - resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do + resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do member do get :test end -- cgit v1.2.3 From 9f3985c6133507ac721abbb4c19049656008ec68 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 11 Apr 2017 22:44:22 -0400 Subject: Move PDFLab into GitLab --- config/webpack.config.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index cb0a57a3a41..0ec9e48845e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -77,6 +77,11 @@ var config = { test: /\.svg$/, loader: 'raw-loader', }, + { + test: /\.gif$/, + loader: 'url-loader', + query: { mimetype: 'image/gif' }, + }, { test: /\.(worker\.js|pdf)$/, exclude: /node_modules/, -- cgit v1.2.3 From fe57708e6a0f2b09d95e61130310c826b3437524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Fri, 28 Apr 2017 18:05:39 +0000 Subject: Resolve "rspec_profiling is enabled for MySQL" --- config/initializers/rspec_profiling.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index b909cc5b9a4..a7efd74f09e 100644 --- a/config/initializers/rspec_profiling.rb +++ b/config/initializers/rspec_profiling.rb @@ -36,10 +36,10 @@ if Rails.env.test? RspecProfiling::Collectors::PSQL.prepend(RspecProfilingExt::PSQL) config.collector = RspecProfiling::Collectors::PSQL end - end - if ENV.has_key?('CI') && ENV['GITLAB_DATABASE'] == 'postgresql' - RspecProfiling::VCS::Git.prepend(RspecProfilingExt::Git) - RspecProfiling::Run.prepend(RspecProfilingExt::Run) + if ENV.key?('CI') + RspecProfiling::VCS::Git.prepend(RspecProfilingExt::Git) + RspecProfiling::Run.prepend(RspecProfilingExt::Run) + end end end -- cgit v1.2.3 From 2b3fc5e624bd0c8b9e1c68bf2b3741d8898cf0b0 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Sun, 30 Apr 2017 12:15:20 -0500 Subject: Add download button to project snippets --- config/routes/project.rb | 2 +- config/routes/snippets.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 115ae2324b3..e777b9fc6e7 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -44,7 +44,7 @@ constraints(ProjectUrlConstrainer.new) do resources :snippets, concerns: :awardable, constraints: { id: /\d+/ } do member do - get 'raw' + get :raw post :mark_as_spam end end diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb index 56534f677be..4ce4c11aa65 100644 --- a/config/routes/snippets.rb +++ b/config/routes/snippets.rb @@ -1,7 +1,6 @@ resources :snippets, concerns: :awardable do member do - get 'raw' - get 'download' + get :raw post :mark_as_spam post :preview_markdown end -- cgit v1.2.3 From d261f83626b9abde93f91d9850ae3e989348e12d Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Mon, 1 May 2017 20:15:16 +0000 Subject: Update Carrierwave and fog-core --- config/initializers/carrierwave.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 1933afcbfb1..cd7df44351a 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -6,6 +6,8 @@ if File.exist?(aws_file) AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env] CarrierWave.configure do |config| + config.fog_provider = 'fog/aws' + config.fog_credentials = { provider: 'AWS', # required aws_access_key_id: AWS_CONFIG['access_key_id'], # required -- cgit v1.2.3 From 8c3a03c1b9bf5c80571c9dc07ba258fa10dd61c8 Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Thu, 27 Apr 2017 12:41:26 +0200 Subject: Display comments for personal snippets --- config/routes/snippets.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'config') diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb index 56534f677be..bced4a7975e 100644 --- a/config/routes/snippets.rb +++ b/config/routes/snippets.rb @@ -5,6 +5,14 @@ resources :snippets, concerns: :awardable do post :mark_as_spam post :preview_markdown end + + scope module: :snippets do + resources :notes, only: [:index, :create, :destroy, :update], concerns: :awardable, constraints: { id: /\d+/ } do + member do + delete :delete_attachment + end + end + end end get '/s/:username', to: redirect('/u/%{username}/snippets'), -- cgit v1.2.3 From 44e3b0080e459cfbba186d18b63acfebd3f9f209 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 2 May 2017 15:32:15 +0100 Subject: Remove unused initializer We don't appear to have an `active_record_query_trace` dependency any more. --- config/initializers/active_record_query_trace.rb | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 config/initializers/active_record_query_trace.rb (limited to 'config') diff --git a/config/initializers/active_record_query_trace.rb b/config/initializers/active_record_query_trace.rb deleted file mode 100644 index 4b3c2803b3b..00000000000 --- a/config/initializers/active_record_query_trace.rb +++ /dev/null @@ -1,5 +0,0 @@ -if ENV['ENABLE_QUERY_TRACE'] - require 'active_record_query_trace' - - ActiveRecordQueryTrace.enabled = 'true' -end -- cgit v1.2.3