Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' ...

Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530

2015-02-25 23:36:03 +00:00

..

admin

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

explore

Respect star ordering on explore page

2015-02-18 16:40:22 -08:00

groups

Add tests for remove group member feature in admin area

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

import

Re-enable rescuing from Bitbucket OAuth errors.

2015-02-24 15:07:25 +01:00

oauth

Application admin scaffold

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

profiles

Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).

2015-02-13 14:44:42 +01:00

projects

Merge branch 'master' into extend_markdown_upload

2015-02-25 11:59:25 +01:00

application_controller.rb

Load public key in initializer.

2015-02-24 15:07:24 +01: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

Fix event loading with associations

2015-02-18 09:38:46 -08:00

groups_controller.rb

Fix event loading with associations

2015-02-18 09:38:46 -08: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

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

Use shorter map() syntax

2015-02-15 20:50:53 -07:00

projects_controller.rb

Merge branch 'master' into extend_markdown_upload

2015-02-25 11:59:25 +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

Link head panel titles to relevant root page.

2015-02-13 14:31:51 +01:00

uploads_controller.rb

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

users_controller.rb

Exclude forks from profile contributions list.

2015-02-24 16:28:23 +01:00