Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

mastofe
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

959e4b81

Commit 959e4b81 authored 8 years ago by nicolas Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge branch 'master' into french-translation

parents effdb42f 8a3745a4

Branches

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/api/v1/accounts_controller.rb 1 addition, 1 deletion

app/controllers/api/v1/accounts_controller.rb
app/controllers/api/v1/notifications_controller.rb 1 addition, 1 deletion

app/controllers/api/v1/notifications_controller.rb
app/controllers/api/v1/timelines_controller.rb 1 addition, 1 deletion

app/controllers/api/v1/timelines_controller.rb
app/controllers/settings/preferences_controller.rb 5 additions, 2 deletions

app/controllers/settings/preferences_controller.rb
app/lib/feed_manager.rb 15 additions, 11 deletions

app/lib/feed_manager.rb
app/models/account.rb 2 additions, 2 deletions

app/models/account.rb
app/models/user.rb 1 addition, 0 deletions

app/models/user.rb
app/services/notify_service.rb 2 additions, 0 deletions

app/services/notify_service.rb
app/views/settings/preferences/show.html.haml 4 additions, 0 deletions

app/views/settings/preferences/show.html.haml
config/i18n-tasks.yml 0 additions, 3 deletions

config/i18n-tasks.yml
config/locales/simple_form.de.yml 3 additions, 0 deletions

config/locales/simple_form.de.yml
config/locales/simple_form.en.yml 3 additions, 0 deletions

config/locales/simple_form.en.yml

with 38 additions and 21 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