Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

8100f968

Commit 8100f968 authored 7 years ago by Douwe Maan

Downloads
- Plain Diff

Merge branch 'zj-upgrade-carrierwave' into 'master'

Update Carrierwave and fog-core

See merge request !11016

parents 3d318f3c d261f836

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 2 additions, 2 deletions

Gemfile
Gemfile.lock 10 additions, 12 deletions

Gemfile.lock
app/workers/expire_build_instance_artifacts_worker.rb 1 addition, 1 deletion

app/workers/expire_build_instance_artifacts_worker.rb
config/initializers/carrierwave.rb 2 additions, 0 deletions

config/initializers/carrierwave.rb
spec/factories/projects.rb 4 additions, 0 deletions

spec/factories/projects.rb
spec/models/project_spec.rb 6 additions, 9 deletions

spec/models/project_spec.rb
spec/workers/expire_build_instance_artifacts_worker_spec.rb 4 additions, 2 deletions

spec/workers/expire_build_instance_artifacts_worker_spec.rb

with 29 additions and 26 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