Douwe Maan ceb342c716 Merge branch 'increase_import_timeout' into 'master' ...

Increase project import timeout from 4 minutes to 15 minutes

Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.

Fixes gitlab-org/gitlab-ee#246

## Import screenshot

![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png)


See merge request !2717

2016-02-09 10:41:11 +00:00

..

groups

New padding for lists

2016-02-04 19:57:07 +01:00

issuable

Add j and k shortcuts

2016-02-05 14:40:50 -05:00

projects

Merge branch 'paginate-dashboard-projects' into 'master'

2016-02-05 15:02:47 +00:00

snippets

Highlight note code and edit preview

2016-01-25 11:42:47 +01:00

_choose_group_avatar_button.html.haml

Refactor buttons

2015-03-14 00:29:32 -07:00

_clone_panel.html.haml

Fix css mess around git clone panel. Align it properly

2016-01-14 17:42:15 +01:00

_commit_message_container.html.haml

Add "Start a new merge request" option to every commit form

2015-11-17 18:53:56 +01:00

_confirm_modal.html.haml

Use form-actions where appropriate

2015-12-02 14:41:55 +01:00

_event_filter.html.haml

Start moving all navigation to one class

2016-01-13 15:03:32 +01:00

_field.html.haml

Hide password in the service settings form

2015-10-02 12:48:57 +03:00

_file_highlight.html.haml

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse

2016-02-01 11:33:36 +01:00

_group_form.html.haml

Use consistent casing for form field labels

2015-12-02 14:41:54 +01:00

_group_tips.html.haml

Factor group tips

2014-10-20 23:43:51 +02:00

_import_form.html.haml

Increase project import timeout from 4 minutes to 15 minutes

2016-02-04 13:41:42 -06:00

_issues.html.haml

Add "New X" link to dashboard/group milestone project-specific issue/MR panels

2015-12-02 14:00:54 +01:00

_logo.svg

Correct the logo ID names

2016-01-04 14:54:56 -05:00

_merge_requests.html.haml

Add "New X" link to dashboard/group milestone project-specific issue/MR panels

2015-12-02 14:00:54 +01:00

_milestone_expired.html.haml

sort milestones by due_date

2015-12-03 08:53:34 -06:00

_milestones_filter.html.haml

Use top-area component for top page navigation for pages that contains list of items

2016-02-03 18:41:55 +01:00

_new_commit_form.html.haml

Automatically fork a project when not allowed to edit a file.

2015-12-18 10:03:34 +01:00

_new_project_item_select.html.haml

Sort projects by last activity for new issue dropdown

2016-02-04 12:23:44 +01:00

_no_password.html.haml

LDAP users don't need to set a password to Git over HTTP.

2015-02-23 20:04:18 -08:00

_no_ssh.html.haml

Apply some styles from flatly theme

2015-03-07 00:28:53 -08:00

_outdated_browser.html.haml

check browser version, blacklisting outdated IE (version < 10)

2014-12-24 16:22:08 +01:00

_project_limit.html.haml

Notify user if they cannot create projects

2015-12-05 11:32:08 -05:00

_promo.html.haml

Substituted deprecated forum link with project issues link. [ci skip]

2016-01-25 13:10:11 -06:00

_ref_switcher.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_service_settings.html.haml

Issue #5817 wording of the web hooks updated on issue and merge events

2016-01-11 01:02:27 -02:00

_show_aside.html.haml

Fix wrong placement of show-aside link

2015-04-27 00:43:02 +02:00

_sort_dropdown.html.haml

Removed sorted text from dropdowns

2016-01-28 09:06:20 +00:00

_visibility_level.html.haml

Add new admin settings

2015-04-26 07:48:19 -06:00

_visibility_radios.html.haml

Fork visibility level fix

2015-07-06 17:40:33 +03:00