Merge pull request #7693 from fjordllc/main

Release 2024-04-16 07:02:00

.github/workflows/git-pr-release-action.yml

@@ -1,20 +1,20 @@
-name: Create a release pull-request
-on:
-  push:
-    branches:
-      - main
-jobs:
-  release_pull_request:
-    runs-on: ubuntu-latest
-    name: release_pull_request
-    steps:
-      - name: checkout
-        uses: actions/checkout@v1
-      - name: create-release-pr
-        uses: grassedge/[email protected]
-        with:
-          base: production
-          head: main
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: release
-          assign: true
+name: Create a release pull-request
+on:
+  push:
+    branches:
+      - main
+jobs:
+  release_pull_request:
+    runs-on: ubuntu-latest
+    name: release_pull_request
+    steps:
+      - name: checkout
+        uses: actions/checkout@main
+      - name: create-release-pr
+        uses: grassedge/[email protected]
+        with:
+          base: production
+          head: main
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: release
+          assign: true

app/models/github_grass.rb

@@ -33,13 +33,13 @@ def fetch
   private
 
   def extract_table(html)
-    table = Nokogiri::HTML(html).css(TABLE_SELECTOR)
+    table = Nokogiri::HTML(html, nil, 'UTF-8').css(TABLE_SELECTOR)
     SELECTORS_TO_REMOVE.each { |selector| table.search(selector).remove }
     table
   end
 
   def fetch_page
-    uri = URI.parse(github_url(@name))
+    uri = URI.parse(github_contributions_url(@name))
     response = Net::HTTP.get_response(uri)
     response.body
   end
@@ -67,7 +67,7 @@ def replace_wday_with_japanese(label, abbreviation)
     label[:class] = 'wdays'
   end
 
-  def github_url(name)
-    "https://github.com/#{name}"
+  def github_contributions_url(name)
+    "https://github.com/users/#{name}/contributions"
   end
 end

app/views/users/_user.html.slim

@@ -17,7 +17,7 @@
           .users-item__header-start
             .users-item__icon
               = link_to user.url
-                span class="a-user-role"
+                span class="a-user-role is-#{user.primary_role}"
                   img.users-item__user-icon-image.a-user-icon title=user.icon_title alt=user.icon_title src=user.avatar_url
           .users-item__header-end
             .card-list-item__rows