Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

67c65535

Commit 67c65535 authored 6 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'spectest' into 'master'

Spectest - gitlab-ci test environment fixed

See merge request portalmec/portalmec!509

parents d1897602 1d23766a

Branches

Tags

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 3 additions, 1 deletion

.gitlab-ci.yml
Gemfile 1 addition, 1 deletion

Gemfile
Gemfile.lock 18 additions, 18 deletions

Gemfile.lock
app/controllers/v1/learning_objects/uploads_controller.rb 2 additions, 2 deletions

app/controllers/v1/learning_objects/uploads_controller.rb
app/services/dspace_service.rb 9 additions, 3 deletions

app/services/dspace_service.rb
config/dspace.yml 3 additions, 4 deletions

config/dspace.yml
config/initializers/elasticsearch.rb 5 additions, 0 deletions

config/initializers/elasticsearch.rb
lib/tasks/dspace_collection.rake 121 additions, 0 deletions

lib/tasks/dspace_collection.rake
spec/acceptance/downloads_spec.rb 6 additions, 4 deletions

spec/acceptance/downloads_spec.rb
spec/factories/attachments.rb 2 additions, 1 deletion

spec/factories/attachments.rb

with 170 additions and 34 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