Dmitriy Zaporozhets c5d65ed62f Merge branch 'userpage-activity-scroll' ...

Conflicts:
	app/controllers/users_controller.rb

2015-03-23 09:45:40 -07:00

..

admin

Include missing events and fix save functionality in admin service template settings form

2015-03-23 05:51:38 -07:00

dashboard

Move group leave action from dashboard/groups to groups/group_members.

2015-03-15 13:52:28 +01:00

explore

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

groups

Move group leave action from dashboard/groups to groups/group_members.

2015-03-15 13:52:28 +01:00

import

Merge branch 'github-org-repos' into 'master'

2015-03-12 17:13:25 +00:00

oauth

Application admin scaffold

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

profiles

Restyle oauth accounts at profile page and add ability to unlink account

2015-03-21 17:46:00 -07:00

projects

Link to CI with ref

2015-03-20 19:19:29 +02:00

application_controller.rb

Use same constant for amount of items per page

2015-03-12 15:37:00 -07: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

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

groups_controller.rb

Move group members index from /members to /group_members.

2015-03-15 13:51:11 +01:00

help_controller.rb

Add GitLab UI development kit

2015-03-08 14:46:22 -07:00

namespaces_controller.rb

Rubocop: no trailing newlines

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

omniauth_callbacks_controller.rb

When add new social account - redirect to accounts page and show notice message

2015-02-08 00:53:31 -08:00

passwords_controller.rb

Use ruby 1.9 hash syntax

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

profiles_controller.rb

Merge branch 'user-location' into 'master'

2015-03-21 00:54:03 +00:00

projects_controller.rb

Update html-pipeline and emoji

2015-03-11 16:05:01 -07:00

registrations_controller.rb

Redirect signup page to signin page.

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

search_controller.rb

Only trigger actual search if a search string is present

2015-03-19 10:50:34 +01:00

sessions_controller.rb

Improve application settings and write tests

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

snippets_controller.rb

Merge branch 'master' into fix-restricted-visibility

2015-03-14 10:49:11 -06:00

uploads_controller.rb

Reject access to group/project avatar if the user doesn't have access.

2015-03-10 17:13:02 +01:00

users_controller.rb

Merge branch 'userpage-activity-scroll'

2015-03-23 09:45:40 -07:00