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

b218e82b

Commit b218e82b authored 8 years ago by Douwe Maan

Downloads
- Plain Diff

Merge branch 'issuable-todo-improvements'

# Conflicts:
#	app/controllers/projects/todos_controller.rb

parents 5ef749b7 914f9731

Branches

Tags

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/right_sidebar.js.coffee 11 additions, 7 deletions

app/assets/javascripts/right_sidebar.js.coffee
app/controllers/projects/todos_controller.rb 11 additions, 11 deletions

app/controllers/projects/todos_controller.rb
app/helpers/issuables_helper.rb 3 additions, 3 deletions

app/helpers/issuables_helper.rb
app/helpers/todos_helper.rb 1 addition, 1 deletion

app/helpers/todos_helper.rb
app/views/shared/issuable/_sidebar.html.haml 5 additions, 5 deletions

app/views/shared/issuable/_sidebar.html.haml
config/routes.rb 1 addition, 1 deletion

config/routes.rb
spec/controllers/projects/todo_controller_spec.rb 102 additions, 0 deletions

spec/controllers/projects/todo_controller_spec.rb
spec/features/issues/todo_spec.rb 10 additions, 0 deletions

spec/features/issues/todo_spec.rb

with 144 additions and 28 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