Dmitriy Zaporozhets 89f8020fe1 Merge branch 'mention-groups' ...

Conflicts:
	CHANGELOG

2015-02-06 16:45:37 -08:00

..

admin

Refactor sorting in project

2015-02-05 19:15:05 -08:00

explore

Factor abilities methods

2014-10-19 11:12:39 +02:00

groups

Add tests for remove group member feature in admin area

2014-10-20 13:18:07 +03:00

import

GitHub importer refactoring

2015-02-05 21:48:21 -08:00

oauth

Application admin scaffold

2015-01-17 15:40:09 -08:00

profiles

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

projects

Apply default scope to labels and remove one for notes

2015-02-05 20:29:41 -08:00

application_controller.rb

Refactor sorting in project

2015-02-05 19:15:05 -08:00

confirmations_controller.rb

Try signing in the user after user confirmation is correct and redirect to dashboard, otherwise redirect to signin page

2014-10-02 14:38:26 +02:00

dashboard_controller.rb

Refactor sorting in project

2015-02-05 19:15:05 -08:00

files_controller.rb

Show image attachments in browser instead of downloading them.

2015-02-04 15:35:10 +01:00

groups_controller.rb

Merge branch 'project-path' into 'master'

2014-12-24 13:27:26 +00:00

help_controller.rb

Remove garbage and apply wiki style

2014-06-14 15:51:07 +03:00

namespaces_controller.rb

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08:00

omniauth_callbacks_controller.rb

ForbiddenAction constant fix

2015-01-12 09:30:52 -08:00

passwords_controller.rb

Use ruby 1.9 hash syntax

2015-01-23 17:41:10 -08:00

profiles_controller.rb

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

projects_controller.rb

Allow groups to be mentioned.

2015-02-05 19:10:52 +01:00

registrations_controller.rb

Redirect signup page to signin page.

2015-02-05 15:56:28 +01:00

search_controller.rb

Merge pull request #7695 from coverer/search_wiki

2014-09-09 16:50:43 +03:00

sessions_controller.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

snippets_controller.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

users_controller.rb

Improve contribution calendar on user page

2015-01-29 17:07:44 -08:00