Skip to content

Commit

Permalink
Merge branch 'resciencec' into no-tracks
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuanxu
xuanxu committed Apr 19, 2023
2 parents 2909551 + 75f2988 commit 9c449a9
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 115 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem 'octokit', '~> 6.0'
gem 'pdf-reader', '~> 2.11.0'
gem 'pg', '~> 1.4.6'
gem 'will_paginate', '~> 3.3.1'
gem 'rails', '7.0.4.2'
gem 'rails', '7.0.4.3'
gem "importmap-rails"
gem "turbo-rails"
gem "stimulus-rails"
Expand Down
162 changes: 81 additions & 81 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,83 +4,83 @@ GEM
Ascii85 (1.1.0)
aasm (5.5.0)
concurrent-ruby (~> 1.0)
actioncable (7.0.4.2)
actionpack (= 7.0.4.2)
activesupport (= 7.0.4.2)
actioncable (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.4.2)
actionpack (= 7.0.4.2)
activejob (= 7.0.4.2)
activerecord (= 7.0.4.2)
activestorage (= 7.0.4.2)
activesupport (= 7.0.4.2)
actionmailbox (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.4.2)
actionpack (= 7.0.4.2)
actionview (= 7.0.4.2)
activejob (= 7.0.4.2)
activesupport (= 7.0.4.2)
actionmailer (7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activesupport (= 7.0.4.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.4.2)
actionview (= 7.0.4.2)
activesupport (= 7.0.4.2)
actionpack (7.0.4.3)
actionview (= 7.0.4.3)
activesupport (= 7.0.4.3)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.4.2)
actionpack (= 7.0.4.2)
activerecord (= 7.0.4.2)
activestorage (= 7.0.4.2)
activesupport (= 7.0.4.2)
actiontext (7.0.4.3)
actionpack (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.4.2)
activesupport (= 7.0.4.2)
actionview (7.0.4.3)
activesupport (= 7.0.4.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_link_to (1.0.5)
actionpack
addressable
activejob (7.0.4.2)
activesupport (= 7.0.4.2)
activejob (7.0.4.3)
activesupport (= 7.0.4.3)
globalid (>= 0.3.6)
activemodel (7.0.4.2)
activesupport (= 7.0.4.2)
activerecord (7.0.4.2)
activemodel (= 7.0.4.2)
activesupport (= 7.0.4.2)
activestorage (7.0.4.2)
actionpack (= 7.0.4.2)
activejob (= 7.0.4.2)
activerecord (= 7.0.4.2)
activesupport (= 7.0.4.2)
activemodel (7.0.4.3)
activesupport (= 7.0.4.3)
activerecord (7.0.4.3)
activemodel (= 7.0.4.3)
activesupport (= 7.0.4.3)
activestorage (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activesupport (= 7.0.4.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.4.2)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
afm (0.2.2)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
builder (3.2.4)
byebug (11.1.3)
capybara (3.38.0)
capybara (3.39.0)
addressable
matrix
mini_mime (>= 0.1.3)
Expand All @@ -91,9 +91,9 @@ GEM
xpath (~> 3.2)
chartkick (5.0.1)
coderay (1.1.3)
commonmarker (0.23.8)
commonmarker (0.23.9)
concurrent-ruby (1.2.2)
connection_pool (2.3.0)
connection_pool (2.4.0)
crack (0.4.5)
rexml
crass (1.0.6)
Expand Down Expand Up @@ -156,7 +156,7 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-drive_v3 (0.36.0)
google-apis-drive_v3 (0.37.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-sheets_v4 (0.22.0)
google-apis-core (>= 0.11.0, < 2.a)
Expand Down Expand Up @@ -192,7 +192,7 @@ GEM
hashdiff (1.0.1)
hashery (2.1.2)
hashie (5.0.0)
honeybadger (5.2.0)
honeybadger (5.2.1)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
Expand All @@ -216,7 +216,7 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.19.1)
loofah (2.20.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.2.8)
Expand All @@ -234,7 +234,7 @@ GEM
mini_racer (0.6.3)
libv8-node (~> 16.10.0.0)
minitest (5.18.0)
msgpack (1.6.1)
msgpack (1.7.0)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.3.0)
Expand All @@ -250,15 +250,15 @@ GEM
net-ssh (>= 5.0.0, < 8.0.0)
net-smtp (0.3.3)
net-protocol
net-ssh (7.0.1)
newrelic_rpm (9.0.0)
nio4r (2.5.8)
nokogiri (1.14.2)
net-ssh (7.1.0)
newrelic_rpm (9.1.0)
nio4r (2.5.9)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.14.2-x86_64-darwin)
nokogiri (1.14.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.14.2-x86_64-linux)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand All @@ -270,12 +270,12 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
octicons (18.1.0)
octicons_helper (18.1.0)
octicons (18.3.0)
octicons_helper (18.3.0)
actionview
octicons (= 18.1.0)
octicons (= 18.3.0)
railties
octokit (6.0.1)
octokit (6.1.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
omniauth (2.1.1)
Expand Down Expand Up @@ -307,30 +307,30 @@ GEM
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
public_suffix (5.0.1)
puma (6.1.1)
puma (6.2.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.3)
rack (2.2.6.4)
rack-livereload (0.3.17)
rack
rack-protection (3.0.5)
rack-protection (3.0.6)
rack
rack-test (2.0.2)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.4.2)
actioncable (= 7.0.4.2)
actionmailbox (= 7.0.4.2)
actionmailer (= 7.0.4.2)
actionpack (= 7.0.4.2)
actiontext (= 7.0.4.2)
actionview (= 7.0.4.2)
activejob (= 7.0.4.2)
activemodel (= 7.0.4.2)
activerecord (= 7.0.4.2)
activestorage (= 7.0.4.2)
activesupport (= 7.0.4.2)
rails (7.0.4.3)
actioncable (= 7.0.4.3)
actionmailbox (= 7.0.4.3)
actionmailer (= 7.0.4.3)
actionpack (= 7.0.4.3)
actiontext (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activemodel (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
bundler (>= 1.15.0)
railties (= 7.0.4.2)
railties (= 7.0.4.3)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -340,9 +340,9 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (7.0.4.2)
actionpack (= 7.0.4.2)
activesupport (= 7.0.4.2)
railties (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -353,7 +353,7 @@ GEM
ffi (~> 1.0)
redis (5.0.6)
redis-client (>= 0.9.0)
redis-client (0.13.0)
redis-client (0.14.1)
connection_pool
regexp_parser (2.7.0)
representable (3.2.0)
Expand All @@ -370,7 +370,7 @@ GEM
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
rspec-mocks (3.12.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.1)
Expand Down Expand Up @@ -400,10 +400,10 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
searchkick (5.2.1)
searchkick (5.2.2)
activemodel (>= 5.2)
hashie
selenium-webdriver (4.8.1)
selenium-webdriver (4.8.6)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -443,7 +443,7 @@ GEM
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
vcr (6.1.0)
version_gem (1.1.1)
version_gem (1.1.2)
web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
Expand Down Expand Up @@ -499,7 +499,7 @@ DEPENDENCIES
pry-byebug
puma
rack-livereload
rails (= 7.0.4.2)
rails (= 7.0.4.3)
rails-controller-testing (~> 1.0.5)
redis (~> 5.0)
responders
Expand Down
2 changes: 1 addition & 1 deletion app/views/papers/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="form-group">
<div class="row">
<div class="col">
<%= f.label "Git branch containing the paper" %>
<%= f.label "Name of git branch containing the paper, not the path" %>
<%= f.text_field :git_branch, placeholder: "Leave blank if paper.md is in the default branch", class: "form-control" %>
</div>
<div class="col">
Expand Down
2 changes: 1 addition & 1 deletion config/settings-production.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ submission_enquiry: |-
Briefly describe your software, its research application and any questions you have about the ReScience C submission criteria.
paper_types: []
bot_username: editorialbot
bot_username: botsci
Loading

0 comments on commit 9c449a9

Please sign in to comment.