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

2cf7105b

Commit 2cf7105b authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'assuntos' into 'master'

Assuntos



See merge request !53

parents efc9ecea 5439bc13

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 2 additions, 2 deletions

Gemfile
Gemfile.lock 0 additions, 8 deletions

Gemfile.lock
app/controllers/welcome_controller.rb 8 additions, 0 deletions

app/controllers/welcome_controller.rb
app/views/search/index.html.erb 1 addition, 49 deletions

app/views/search/index.html.erb
app/views/shared/application/_header.html.erb 1 addition, 1 deletion

app/views/shared/application/_header.html.erb
app/views/welcome/subject.html.erb 71 additions, 0 deletions

app/views/welcome/subject.html.erb
config/orientdb.yml 1 addition, 1 deletion

config/orientdb.yml
config/routes.rb 2 additions, 0 deletions

config/routes.rb

with 86 additions and 61 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