Merge branch 'master' into live

Hide njump link for users without pubkey
Merge branch 'feature/admin_pages' into live
2024-08-17 14:42:32 +02:00 · 2024-06-23 17:33:34 +02:00 · 2024-06-23 17:30:22 +02:00 · 2024-06-23 17:27:03 +02:00 · 2024-06-20 15:52:03 +02:00 · 2024-06-20 15:28:55 +02:00
2 changed files with 4 additions and 0 deletions
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -205,7 +205,9 @@
            ) %>
          </td>
          <td class="text-right">
            <% if @user.nostr_pubkey.present? %>
            <%= link_to "Open profile", "https://njump.me/#{@user.nostr_pubkey_bech32}", class: "btn-sm btn-gray" %>
            <% end %>
          </td>
        </tr>
        <% end %>
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,4 +1,6 @@
 :concurrency: 2
 production:
  :concurrency: 10
 :queues:
  - default
  - mailers
Author	SHA1	Message	Date
Râu Cao	12f82061e8	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-17 14:42:32 +02:00
Râu Cao	a07b4369ab	Hide njump link for users without pubkey All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-23 17:33:34 +02:00
Râu Cao	2605c06807	Merge branch 'feature/admin_pages' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-23 17:30:22 +02:00
Râu Cao	1db768fb15	Merge branch 'feature/admin_pages' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-23 17:27:03 +02:00
Râu Cao	8a7403df32	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 15:52:03 +02:00
Râu Cao	f0295fef7a	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 15:28:55 +02:00
Râu Cao	090affd304	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 14:51:20 +02:00
Râu Cao	bafddd436b	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 13:59:59 +02:00
Râu Cao	560f193c4b	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 13:56:11 +02:00
Râu Cao	8aabbad5bb	Merge branch 'feature/strfry_zap_receipts' into live	2024-06-20 13:56:00 +02:00
Râu Cao	ba8d21eb7a	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-09 13:29:57 +02:00
Râu Cao	53df455d53	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-09 13:17:51 +02:00
Râu Cao	9f1af3a9aa	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-07 14:13:53 +02:00
Râu Cao	1d09008ce2	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-04 17:45:13 +02:00
Râu Cao	57c5317c38	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-21 18:29:13 +02:00
Râu Cao	41bd920060	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-21 18:09:09 +02:00
Râu Cao	0815fa6040	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 17:07:58 +02:00
Râu Cao	af0e99aa50	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 16:55:10 +02:00
Râu Cao	f05eec5255	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 16:48:28 +02:00
Râu Cao	66ca2dc6b0	Merge branch 'feature/173-nostr_ldap' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 13:44:24 +02:00
Râu Cao	800183e9da	Increase sidekiq concurrency in prod All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 13:44:01 +02:00