Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist ...

Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb

2013-06-04 18:36:22 +03:00

..

admin

Renames resque resource to background_jobs

2013-05-30 09:46:28 +03:00

projects

Codestyle improved

2013-03-25 16:28:39 +04:00

public

Add simple search to projects in public area

2013-05-13 21:18:08 +03:00

teams

s/was/were/ for plural subjects

2013-04-09 22:43:02 -04:00

application_controller.rb

Grammar fix in error message for blocked login (in "application_controller.rb")

2013-05-28 14:48:51 -03:00

blame_controller.rb

fixed blame and mr factory

2013-04-03 10:06:31 +03:00

blob_controller.rb

Proper routing. blobs for blobs, raw for send_data

2013-04-03 09:26:38 +03:00

commit_controller.rb

Fix comment and reply buttons

2013-01-02 20:49:27 +01:00

commits_controller.rb

remove Tree/Commit decorator usage from controllers

2013-03-31 23:46:25 +03:00

compare_controller.rb

Use Gitlab::Git:: for git features across application

2013-04-01 16:04:35 +03:00

dashboard_controller.rb

TeamManagement: Dont update permissions if it was not changed

2013-05-30 11:13:38 +03:00

deploy_keys_controller.rb

Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project

2013-06-03 19:49:04 +03:00

edit_tree_controller.rb

Fix 500 error on edit with ui

2013-04-22 11:48:52 +03:00

errors_controller.rb

No gitolite in project any more

2013-02-11 19:16:59 +02:00

files_controller.rb

Files controller handle redirect to remote storage. Added config block to carrierwave init

2013-05-15 22:35:59 +03:00

graph_controller.rb

Enable to filter graph by ref

2013-05-13 18:44:50 +09:00

groups_controller.rb

s/was/were/ for plural subjects

2013-04-09 22:43:02 -04:00

help_controller.rb

UI: add new button, top panel restyle etc

2012-01-18 22:15:45 +02:00

hooks_controller.rb

rename ProjectController to ProjectResourceController

2012-09-27 20:59:42 +02:00

issues_controller.rb

Fix bulk issue status update

2013-05-14 14:34:34 +03:00

keys_controller.rb

Fully embrace Ruby 1.9 hash syntax

2012-08-10 18:25:15 -04:00

labels_controller.rb

Include default labels in issues autocomplete etc. Show colored labels on issues show page

2013-05-07 19:26:41 +03:00

merge_requests_controller.rb

Fix bug MR notes not being loaded when navigate from diff tab

2013-04-03 22:14:07 +03:00

milestones_controller.rb

Restyle milestones index

2013-04-16 20:01:21 +03:00

notes_controller.rb

Fix notes for commits inside MR being squashed in one discussion

2013-04-04 09:58:12 +03:00

notifications_controller.rb

save each notification setting with ajax on change

2013-04-04 22:11:51 +03:00

omniauth_callbacks_controller.rb

Update uses of Gitolite.config.foo settings

2012-12-20 16:54:28 +01:00

profiles_controller.rb

Dont allow LDAP users to change password inside GitLab

2013-05-24 17:12:27 +03:00

project_resource_controller.rb

REpostiry, Team models

2013-01-03 21:09:18 +02:00

projects_controller.rb

Rename repo feature

2013-05-25 00:07:19 +03:00

protected_branches_controller.rb

rename ProjectController to ProjectResourceController

2012-09-27 20:59:42 +02:00

raw_controller.rb

Proper routing. blobs for blobs, raw for send_data

2013-04-03 09:26:38 +03:00

refs_controller.rb

Set @options in assing_ref_vars

2013-05-13 18:44:33 +09:00

registrations_controller.rb

Add settings for user permission defaults

2013-05-16 18:02:22 +04:00

repositories_controller.rb

Provide a path to repo archive. gitlab_git up to 1.0.5

2013-04-29 09:15:18 +03:00

search_controller.rb

Fix paginate of blobs, fixed preserve in dev mode for blob results

2013-05-14 20:25:16 +03:00

services_controller.rb

Campfire service added

2013-05-22 17:59:59 +03:00

snippets_controller.rb

Typos fixed

2013-03-25 20:32:10 +04:00

team_members_controller.rb

remove yaml_db gem, Replace team members index route with team_index

2013-04-11 09:39:49 +03:00

teams_controller.rb

Rebuild team area

2013-03-14 12:38:43 +02:00

tree_controller.rb

Refactor: remove dup code

2013-05-13 18:41:04 +09:00

users_controller.rb

Fix routing. Finalize user show page

2013-01-22 19:45:13 +02:00

walls_controller.rb

move Wall to own resource

2013-03-19 12:35:42 +02:00

wikis_controller.rb

Refactoring and cleanup. Removed unused commit finders

2013-04-03 21:05:10 +03:00