Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

Qpixel
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

c15cdc1c

Commit c15cdc1c authored 1 year ago by Taico Aerts

Downloads
- Plain Diff

Merge branch 'eip-develop' into 'eip-master'

Deploy Custom Badges

See merge request !77

parents 8a901752 8b481859

2 merge requests!81Fix the number of searches graph,!77Deploy Custom Badges

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/users.js 18 additions, 1 deletion

app/assets/javascripts/users.js
app/controllers/badges_controller.rb 49 additions, 1 deletion

app/controllers/badges_controller.rb
app/controllers/users_controller.rb 14 additions, 0 deletions

app/controllers/users_controller.rb
app/models/user_badge.rb 1 addition, 0 deletions

app/models/user_badge.rb
app/views/badges/_form.html.erb 15 additions, 0 deletions

app/views/badges/_form.html.erb
app/views/badges/award.html.erb 46 additions, 0 deletions

app/views/badges/award.html.erb
app/views/badges/index.html.erb 2 additions, 2 deletions

app/views/badges/index.html.erb
config/routes.rb 3 additions, 0 deletions

config/routes.rb
db/migrate/20231120160219_add_is_manually_awardable_to_badges.rb 5 additions, 0 deletions

...ate/20231120160219_add_is_manually_awardable_to_badges.rb
db/migrate/20231122173414_make_user_badge_badge_source_not_optional.rb 6 additions, 0 deletions

...231122173414_make_user_badge_badge_source_not_optional.rb
db/schema.rb 4 additions, 3 deletions

db/schema.rb

with 163 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment