conflict resolve

Author: adsingh14

.env.example

@@ -1,2 +1 @@
-API_USER=
-API_PASS=
+GITHUB_API_TOKEN=

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Problems/questions/bugs about Git program
+    url: https://git-scm.com/community
+    about: Start a discussion on the community mailing list.
+
+  - name: Problems about Git for Windows program
+    url: https://github.com/git-for-windows/git/issues
+    about: Report problems with the Git for Windows program.
+
+  - name: Git documentation (man/help pages)
+    url: https://git-scm.com/community
+    about: >
+      The Git documentation under https://git-scm.com/docs is imported
+      from the Git project itself. Any content problems or suggestions
+      should be reported there.
+
+  - name: Pro Git 2 book content
+    url: https://github.com/progit/progit2/issues
+    about: Report problems with the ProGit 2 book content.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,44 @@
+---
+name: Downloads on https://git-scm.com not working
+description: If you are experiencing problems downloading Git from https://git-scm.com/downloads.
+labels: [bug]
+
+body:
+  # Please follow the instructions below.
+  # An issue properly explained is solved much faster!
+  - type: textarea
+    attributes:
+      # Provide a brief summary of the issue in the issue title.
+      label: Which download is failing?
+      placeholder: Tell us in which page and version is the download broken.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Problem
+      placeholder: Explain the problem clearly.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system and browser
+      description: Which operating system and browser are you using?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      # Provide a detailed list of steps.
+      # In the rare cases where this is not possible, we will accept a detailed set of instructions.
+      label: Steps to reproduce
+      placeholder: |
+        1. 
+        2. 
+        3. 
+        4. 
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Other details
+      placeholder: Include as many relevant details you may find relevant.
+      render: shell

.github/ISSUE_TEMPLATE/downloads.yml

@@ -0,0 +1,34 @@
+---
+name: "git-scm user interface broken"
+about: "git-scm.com user interface is not working"
+---
+
+<!---
+Please follow the instructions below.
+An issue properly explained is solved much faster!
+
+Only report problems with the git-scm.com site's JavaScript, CSS or content that doesn't seem to be doing its job correctly!
+-->
+
+<!--- Provide a brief summary of the issue in the issue title -->
+
+### URL for broken page
+
+<!--- Give us the link to the broken page -->
+
+### Problem
+
+<!--- Explain the problem clearly -->
+
+### Operating system and browser
+
+<!--- Which operating system and browser are you using? -->
+
+### Steps to reproduce
+
+<!--- Provide a detailed list of steps. -->
+<!--- In the rare cases where this is not possible, we will accept a detailed set of instructions. -->
+
+### Other details
+
+<!--- Include as many relevant details you may find relevant -->

.github/ISSUE_TEMPLATE/ui.md

@@ -0,0 +1,9 @@
+## Changes
+
+<!-- List the changes this PR makes. -->
+
+-
+
+## Context
+
+<!-- Explain why you're making these changes. -->

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+name: CI
+on: pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: ruby setup
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+
+    - name: rails setup
+      run: bundle exec rake db:create db:schema:load
+
+    - name: rubocop
+      run: bundle exec rubocop -P
+
+    - name: rspec
+      run: bundle exec rspec

.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+require:
+  - rubocop-rails
+
+inherit_gem:
+  rubocop-github:
+    - config/default.yml
+    - config/rails.yml
+
+AllCops:
+  TargetRubyVersion: 2.7
+
+Performance:
+  enabled: true
+
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - db/schema.rb
+
+Rails/HelperInstanceVariable:
+  Enabled: false
+
+Rails/TimeZone:
+  Enabled: false
+
+GitHub/InsecureHashAlgorithm:
+  Enabled: false

.rubocop.yml

@@ -1 +1 @@
-2.4.2
+2.7.3