Merge branch 'master' into live

Merge branch 'feature/user_avatars' into live
2025-05-14 18:58:38 +04:00 · 2025-05-14 15:40:47 +04:00 · 2025-05-14 14:44:14 +04:00 · 2025-05-12 16:40:44 +04:00 · 2025-05-12 15:11:39 +04:00 · 2025-05-06 20:14:42 +04: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
@@ -239,7 +239,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	c6cb9caa6d	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-14 18:58:38 +04:00
Râu Cao	208977177a	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-14 15:40:47 +04:00
Râu Cao	9a406b8381	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-14 14:44:14 +04:00
Râu Cao	4c972bfe7a	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-12 16:40:44 +04:00
Râu Cao	0191d248f8	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-12 15:11:39 +04:00
Râu Cao	710afb6c78	Merge branch 'chore/215-configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-06 20:14:42 +04:00
Râu Cao	69e9662133	Merge branch 'chore/215-configs' into live Some checks failed continuous-integration/drone/push Build is failing Details	2025-05-06 20:01:15 +04:00
Râu Cao	a73d0f29bd	Merge branch 'chore/215-configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-06 19:53:52 +04:00
Râu Cao	7836805570	Merge branch 'chore/215-configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-06 19:04:03 +04:00
Râu Cao	1fc434cb3a	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-05 17:39:06 +04:00
Râu Cao	dad7d5195e	Merge branch 'chore/db_configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-05 15:28:16 +04:00
Râu Cao	596cad34da	Merge branch 'chore/upgrade_rails' into live	2025-04-29 17:25:25 +04:00
Râu Cao	aaee5cb4ed	Merge branch 'chore/upgrade_rails' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-04-28 17:56:57 +04:00
Râu Cao	ebaca5ba65	Merge branch 'chore/upgrade_rails' into live	2025-04-28 15:58:17 +04:00
Râu Cao	b6bcfa2ee3	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-04-18 14:54:01 +04:00
Râu Cao	9082ee45d8	Merge branch 'master' into live	2025-01-02 08:32:15 -05:00
Râu Cao	29264aad98	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-16 13:33:35 +02:00
Râu Cao	259b51a95e	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-24 21:40:25 +02:00
Râu Cao	fb369530e3	Merge branch 'master' into live Some checks failed continuous-integration/drone/push Build is failing Details	2024-09-14 17:18:09 +02:00
Râu Cao	5dc10a4d33	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-14 16:46:27 +02:00
Râu Cao	2297c68046	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-14 16:41:01 +02:00
Râu Cao	b82ab45c99	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-14 14:57:35 +02:00
Râu Cao	d12c63db26	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-10 16:07:24 +02:00
Râu Cao	e6a9ef84ce	Merge branch 'master' into live Some checks failed continuous-integration/drone/push Build is failing Details	2024-08-19 15:13:46 +02:00
Râu Cao	b7e91344a0	Merge branch 'master' into live Some checks failed continuous-integration/drone/push Build is failing Details	2024-08-19 14:48:35 +02:00
Râu Cao	0f07e32781	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-17 14:49:29 +02:00
Râu Cao	1311b5ed6a	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-17 14:46:00 +02:00
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