Kamil Trzcinski f31d8ef287 Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g ...

* commit '4c53cc0ebac36560d806732ff1fefba9206c75f3':
  rubocop satisfy

Conflicts:
	app/controllers/ci/builds_controller.rb
	app/controllers/ci/commits_controller.rb

2015-09-14 14:04:08 +02:00

..

admin

added spinach for glabal labels

2015-09-03 19:02:14 +03:00

ci

Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-14 14:04:08 +02:00

concerns

Refactor SessionsController to use a controller concern

2015-05-14 14:24:05 -04:00

dashboard

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

explore

Allow listing of archived projects

2015-08-19 13:46:59 +02:00

groups

Use before_actions

2015-07-31 14:15:49 +02:00

import

FogBugz project import

2015-09-08 20:23:01 -04:00

oauth

Move helpers back to original directory

2015-09-09 14:37:34 +02:00

profiles

Allow user to specify content he wants to see on project page

2015-07-13 18:24:15 +02:00

projects

Move helpers back to original directory

2015-09-09 14:37:34 +02:00

abuse_reports_controller.rb

Improve wording in abuse report form

2015-08-06 15:15:17 +02:00

application_controller.rb

Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-09 14:56:02 +02:00

autocomplete_controller.rb

Fix bug preventing invite by e-mail

2015-08-21 13:47:56 -07:00

confirmations_controller.rb

Add invites controller.

2015-04-14 12:07:33 +02:00

dashboard_controller.rb

Split starred projects list and activity in same way like we did with your projects

2015-09-02 19:17:04 +02:00

groups_controller.rb

Raise alert when group is deleted.

2015-07-30 14:11:26 +03:00

help_controller.rb

Use File.join instead of Rails.root.join in HelpController

2015-08-18 09:08:03 -07:00

invites_controller.rb

Add a page title to every page.

2015-04-30 19:12:15 +02:00

namespaces_controller.rb

Fixed the Rails/ActionFilter cop

2015-04-20 15:39:37 +02:00

omniauth_callbacks_controller.rb

Allow custom label to be set for authentication providers.

2015-07-23 15:20:12 +02:00

passwords_controller.rb

Use User#two_factor_enabled instead of otp_required_for_login

2015-06-19 15:14:37 -04:00

profiles_controller.rb

Merge branch 'audit_log' into 'master'

2015-07-06 10:09:53 +00:00

projects_controller.rb

Mention group and project name in flash messages upon create, update and delete.

2015-07-30 01:22:16 +03:00

registrations_controller.rb

Fix error when deleting a user who has projects

2015-06-23 04:39:49 -07:00

root_controller.rb

Refactor RootController

2015-06-13 17:59:13 -04:00

search_controller.rb

Move helpers back to original directory

2015-09-09 14:37:34 +02:00

sessions_controller.rb

Crowd integration

2015-09-02 12:42:01 +03:00

snippets_controller.rb

Update controller filters

2015-06-26 16:44:21 +02:00

uploads_controller.rb

Don't symbolize params.

2015-05-11 11:55:02 +02:00

users_controller.rb

Make all profile public

2015-08-27 13:06:14 +03:00