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

..

backend

Increase project import timeout from 4 minutes to 15 minutes

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

bitbucket_import

Wrap errors on GitHub importer to raise Projects::ImportService::Error

2016-01-26 10:56:22 -02:00

ci/build/artifacts

Add method that calculates total size for artifacts subfolder

2016-01-20 21:55:13 +01:00

diff

Mark inline difference between old and new paths when a file is renamed

2016-01-29 19:37:17 +01:00

email

Added X-GitLab-... headers to emails from CI and Email On Push services

2016-01-19 20:18:39 +02:00

fogbugz_import

DRY up upload and download services

2016-01-08 17:38:53 +01:00

git

Fire update hook from GitLab

2015-11-30 18:36:34 +02:00

github_import

Wrap errors on GitHub importer to raise Projects::ImportService::Error

2016-01-26 10:56:22 -02:00

gitlab_import

Use CGI.escape instead of URI.escape, because URI is obsoleted.

2016-01-12 18:20:03 +08:00

gitorious_import

Fixed Rubocop offenses

2015-12-15 00:53:52 -02:00

google_code_import

Fixed Rubocop offenses

2015-12-15 00:53:52 -02:00

graphs

Refactor commits graph

2014-09-29 12:05:17 +03:00

ldap

Allow LDAP users to change their email if it was not set by the LDAP server

2016-01-19 16:25:38 +01:00

lfs

Recursivity needed if a fork is a fork of a fork.

2015-12-04 12:32:13 +01:00

markdown

Prevent circular reference error in Banzai

2016-01-14 11:30:28 +01:00

metrics

Correct arity for instrumented methods w/o args

2016-01-25 21:28:59 +01:00

middleware

Revert "Increase timeout for Git-over-HTTP requests."

2015-03-19 18:29:20 -07:00

o_auth

Allow LDAP users to change their email if it was not set by the LDAP server

2016-01-19 16:25:38 +01:00

sherlock

Added total query time to Sherlock

2015-11-24 10:57:21 +01:00

sidekiq_middleware

Use SIGKILL by default in Sidekiq::MemoryKiller

2015-05-13 17:09:12 +02:00

sql

Fix UNION syntax for MySQL

2015-11-18 13:31:18 +01:00

access.rb

Improve description of branch protection levels.

2015-05-13 09:41:55 +02:00

akismet_helper.rb

Memoize Akismet client initialization on AkismetHelper

2016-02-02 11:25:44 -02:00

app_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

asciidoc.rb

Move Markdown/reference logic from Gitlab::Markdown to Banzai

2015-12-15 15:51:16 +01:00

auth.rb

Session API: Use case-insensitive authentication like in UI

2014-10-30 18:29:18 +02:00

bitbucket_import.rb

Fix specs.

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

blame.rb

Move blame group logic to dedicated class

2016-01-28 14:49:21 +01:00

build_data_builder.rb

Suppress e-mails on failed builds if allow_failure is set

2016-01-07 10:45:39 -08:00

closing_issue_extractor.rb

Allow invalid URLs in closing pattern

2015-12-02 18:48:39 +01:00

color_schemes.rb

Add count to Themes and ColorSchemes

2015-08-26 11:30:38 -07:00

compare_result.rb

Add ignore white space option in merge request diff

2015-11-13 16:53:53 +09:00

config_helper.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

contributions_calendar.rb

Simplify ContributionsCalendar#starting_year and #starting_month

2016-01-01 22:11:34 -05:00

contributor.rb

Move lib/gitlab/contributors to its correct path

2015-04-09 15:34:55 -04:00

current_settings.rb

Fix CurrentSettings autoload bug in development.

2016-02-08 15:28:48 +01:00

database.rb

Display database type and version in Administration dashboard

2016-02-02 17:59:09 -05:00

force_push_check.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

git_access_status.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

git_access_wiki.rb

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

git_access.rb

Add support for git lfs.

2015-11-16 12:39:13 +01:00

git_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

git_ref_validator.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

git.rb

Show git version on admin page

2015-12-15 08:02:19 -08:00

gitorious_import.rb

Define GITORIOUS_HOST only once

2015-06-10 01:31:27 -04:00

highlight.rb

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs

2016-02-01 13:51:05 +01:00

identifier.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

import_formatter.rb

Fix bug where only the first 15 Bitbucket issues would be imported.

2015-09-01 08:50:20 -07:00

import_sources.rb

FogBugz project import

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

incoming_email.rb

Make Reply by email easier to configure

2015-10-13 13:10:49 +02:00

issues_labels.rb

remove feature label

2014-10-31 17:22:16 -07:00

key_fingerprint.rb

Simplify regex.

2015-04-14 15:58:28 +02:00

logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

markup_helper.rb

markup_helper: detect .mkd and .mkdn as markdown

2015-08-12 15:29:15 -04:00

metrics.rb

Make the metrics sampler interval configurable

2016-01-13 12:29:48 +01:00

note_data_builder.rb

No longer needed to pass project argument to commit methods.

2015-04-24 12:29:36 +02:00

popen.rb

Style/RedundantReturn enabled

2015-03-24 18:35:57 -07:00

production_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

project_search_results.rb

Fix commits search for empty repository

2015-11-03 10:16:09 +01:00

push_data_builder.rb

fixes after review

2015-12-07 15:13:06 +02:00

recaptcha.rb

reCAPTCHA is configurable through Admin Settings, no reload needed.

2015-12-28 18:50:29 -02:00

reference_extractor.rb

Prevent circular reference error in Banzai

2016-01-14 11:30:28 +01:00

regex.rb

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue

2016-02-02 15:15:59 +01:00

search_results.rb

Ability to search milestones

2015-08-24 13:59:01 +03:00

seeder.rb

Migrate mailers to ActiveJob

2015-11-26 17:03:43 +02:00

sherlock.rb

Only load rblineprof when actually needed

2015-11-09 15:54:13 +01:00

sidekiq_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

snippet_search_results.rb

one more improvement to snippet search

2016-02-05 18:27:12 +02:00

themes.rb

Add count to Themes and ColorSchemes

2015-08-26 11:30:38 -07:00

upgrader.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

uploads_transfer.rb

Fix: Images cannot show when projects' path was changed

2015-10-14 18:50:35 +03:00

url_builder.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

user_access.rb

Cache LDAP check in Gitlab::UserAccess

2014-08-06 18:03:01 +02:00

utils.rb

add common method to force utf8 and force oauth properties to be utf8

2015-05-03 00:43:46 +03:00

version_info.rb

Fix abort gitlab:app:check

2013-06-06 10:10:51 +09:00

visibility_level.rb

Fix GitlabV::isibilityLevel::level_name method

2015-11-04 22:13:40 +01:00

workhorse.rb

Gotta have newlines

2016-02-01 12:27:35 +01:00