From af5fc6e24ce3e2f5fa42d6764a780afe0d6471d9 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 30 Jun 2016 17:21:57 +0100 Subject: Diff line comments resolve --- config/application.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 06ebb14a5fe..54c82bbcf26 100644 --- a/config/application.rb +++ b/config/application.rb @@ -85,6 +85,7 @@ module Gitlab config.assets.precompile << "users/users_bundle.js" config.assets.precompile << "network/network_bundle.js" config.assets.precompile << "profile/profile_bundle.js" + config.assets.precompile << "line_comments/application.js" config.assets.precompile << "lib/utils/*.js" config.assets.precompile << "lib/*.js" config.assets.precompile << "u2f.js" -- cgit v1.2.1 From b550e6ee67ebfc1cfbbb7a77414f9fe05ffad419 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 4 Jul 2016 15:00:39 +0100 Subject: Posts to rails to update note eventually --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 21f3585bacd..9be5d423052 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -828,6 +828,7 @@ Rails.application.routes.draw do member do post :toggle_award_emoji delete :delete_attachment + post :resolve end end -- cgit v1.2.1 From a55c1232b5922d20942669697c3ee0b5989e5c71 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 5 Jul 2016 17:27:07 +0100 Subject: Resolve all endpoint --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 9be5d423052..cf2f96c74dd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -825,6 +825,10 @@ Rails.application.routes.draw do resources :group_links, only: [:index, :create, :destroy], constraints: { id: /\d+/ } resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do + collection do + post :resolve_all + end + member do post :toggle_award_emoji delete :delete_attachment -- cgit v1.2.1 From eeb41c759e246bf96bda8d8f02478860cc6448bb Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 25 Jul 2016 22:43:47 -0600 Subject: Add endpoints to resolve diff notes and discussions --- config/routes.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index cf2f96c74dd..40dce1745db 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -720,6 +720,13 @@ Rails.application.routes.draw do get :update_branches get :diff_for_path end + + resources :discussions, only: [], constraints: { id: /\h{40}/ } do + member do + post :resolve + delete :resolve, action: :unresolve + end + end end resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } @@ -825,14 +832,11 @@ Rails.application.routes.draw do resources :group_links, only: [:index, :create, :destroy], constraints: { id: /\d+/ } resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do - collection do - post :resolve_all - end - member do post :toggle_award_emoji delete :delete_attachment post :resolve + delete :resolve, action: :unresolve end end -- cgit v1.2.1 From c926cdfa4fbe00be7a7a447b3f23059fda7d7f3c Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 26 Jul 2016 11:56:36 +0100 Subject: convert CS to JS --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 54c82bbcf26..5a4b7fa3ee4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -85,7 +85,7 @@ module Gitlab config.assets.precompile << "users/users_bundle.js" config.assets.precompile << "network/network_bundle.js" config.assets.precompile << "profile/profile_bundle.js" - config.assets.precompile << "line_comments/application.js" + config.assets.precompile << "line_comments/line_comments_bundle.js" config.assets.precompile << "lib/utils/*.js" config.assets.precompile << "lib/*.js" config.assets.precompile << "u2f.js" -- cgit v1.2.1 From 6537a4a8feac08031b3be2133f6756afb3310254 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 26 Jul 2016 13:44:51 +0100 Subject: Correctly resolves/unresolves discussions --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 5a4b7fa3ee4..1646461939d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -85,7 +85,7 @@ module Gitlab config.assets.precompile << "users/users_bundle.js" config.assets.precompile << "network/network_bundle.js" config.assets.precompile << "profile/profile_bundle.js" - config.assets.precompile << "line_comments/line_comments_bundle.js" + config.assets.precompile << "diff_notes/diff_notes_bundle.js" config.assets.precompile << "lib/utils/*.js" config.assets.precompile << "lib/*.js" config.assets.precompile << "u2f.js" -- cgit v1.2.1 From 16c44a5ddd8551224bd94318727a32b52a68425d Mon Sep 17 00:00:00 2001 From: Timothy Andrew Date: Tue, 16 Aug 2016 21:48:36 +0530 Subject: Allow naming U2F devices. 1. Display a list of U2F devices on the `two_factor_auth` page. 2. Allow deleting individual U2F devices. 3. Allow setting a (optional) name for a device (during registration). --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 63a8827a6a2..da431ccc43d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -375,6 +375,8 @@ Rails.application.routes.draw do patch :skip end end + + resources :u2f_registrations, only: [:destroy] end end -- cgit v1.2.1 From e2f9c87600e34a415d43c981e0182094b123771f Mon Sep 17 00:00:00 2001 From: Patricio Cano Date: Fri, 12 Aug 2016 16:16:12 -0500 Subject: Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner Password Credentials flow. --- config/initializers/doorkeeper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 618dba74151..f78f0cf7c5c 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -12,7 +12,7 @@ Doorkeeper.configure do end resource_owner_from_credentials do |routes| - Gitlab::Auth.find_with_user_password(params[:username], params[:password]) + UserRetrievalService.new(params[:username], params[:password]).execute end # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below. -- cgit v1.2.1 From c29780086201b331091be3ba5df0653381cf0c2c Mon Sep 17 00:00:00 2001 From: Patricio Cano Date: Wed, 17 Aug 2016 11:56:50 -0500 Subject: Removed unnecessary service for user retrieval and improved API error message. --- config/initializers/doorkeeper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index f78f0cf7c5c..6d08714dcf7 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -12,7 +12,8 @@ Doorkeeper.configure do end resource_owner_from_credentials do |routes| - UserRetrievalService.new(params[:username], params[:password]).execute + user = Gitlab::Auth.find_with_user_password(params[:username], params[:password]) + user unless user && user.two_factor_enabled? end # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below. -- cgit v1.2.1 From a4137411c62d093a55dc171665dc90325182bb04 Mon Sep 17 00:00:00 2001 From: Patricio Cano Date: Wed, 17 Aug 2016 17:39:20 -0500 Subject: Small refactor and syntax fixes. --- config/initializers/doorkeeper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 6d08714dcf7..fc4b0a72add 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -13,7 +13,7 @@ Doorkeeper.configure do resource_owner_from_credentials do |routes| user = Gitlab::Auth.find_with_user_password(params[:username], params[:password]) - user unless user && user.two_factor_enabled? + user unless user.try(:two_factor_enabled?) end # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below. -- cgit v1.2.1