Commit graph

33 commits

Author SHA1 Message Date
Douwe Maan
40760d3f7b Add header title to import pages 2015-12-02 14:54:24 +01:00
Jason Lee
18cb430f79 Replace CoffeeScript block into JavaScript in Views.
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
2015-11-10 19:17:37 +08:00
Douwe Maan
a32f776609 Make tables full width. 2015-10-19 11:19:45 +02:00
Jared Szechy
e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Stan Hu
fa58a85ed0 Improve error message display when project fails to import 2015-08-11 06:36:42 -07:00
Douwe Maan
2f706fbd23 Merge branch 'fix-broken-code-import' into 'master'
Fix broken code import and display error messages if something went wrong with creating project

Clicking "Import" in Bitbucket import status page would result in:

```
  Rendered import/base/create.js.haml (38.3ms)
Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms)

NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>:
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url'
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path'
  actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for'
  turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer'
  actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to'
  app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700'
  actionview (4.1.11) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:143:in `render'
  rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method'
  actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template'
  actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument'
```

Also, if the project failed to save for some reason, the user was never informed. Screenshot of new error message dump:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/afc15aa6b0cde0080976eab3199cf18b/image.png)

Closes #2241

See merge request !1134
2015-08-11 08:02:49 +00:00
Stan Hu
f1a241e0ed Fix broken code import and display error messages if something went wrong with creating project
Clicking "Import" in Bitbucket import status page would result in:

```
  Rendered import/base/create.js.haml (38.3ms)
Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms)

NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>:
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url'
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path'
  actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for'
  turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer'
  actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to'
  app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700'
  actionview (4.1.11) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:143:in `render'
  rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method'
  actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template'
  actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument'
```

Closes #2241
2015-08-10 23:56:01 -07:00
Stan Hu
e6ef058289 Disable turbolinks when linking to Bitbucket import status
Turbolinks was causing issues with the Bitbucket Javascript/display because it
was trying to intercept /import/bitbucket/status even when a 302 redirection occured.

Closes #2241
2015-08-10 11:44:39 -07:00
Stan Hu
d7accda1ae Show incompatible projects in Bitbucket import status
See #1871
2015-08-07 07:07:08 -07:00
Douwe Maan
26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Stan Hu
9c76a6fa96 Show incompatible projects in Google Code import status
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.

Closes #1531
2015-04-30 06:56:49 -07:00
Douwe Maan
1419e94816 Improve description of Google Code import user map. 2015-04-21 10:33:04 +02:00
Douwe Maan
63b21945d2 Merge branch 'google-code-import' into 'master'
Import projects from Google Code.

Resolves #1257.

Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @o9000).

### To do

- [x] List projects from Google Takeout file
- [x] Import Git repository
- [x] Import issues
- [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50)
- [x] Handle deleted attachments
- [x] Handle blockedOn attribute
- [x] Add directions on how to get data from Google Takeout

### Import instructions

![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png)

### Imported issue

![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png)

See merge request !471
2015-04-15 06:53:42 +00:00
Douwe Maan
1abda4458e "interpunction" -> "punctuation" 2015-04-14 14:59:10 +02:00
Douwe Maan
4c6ce0ef78 Move Specify user map button to paragraph. 2015-04-14 14:57:15 +02:00
Douwe Maan
dba63d667d Allow user map to be specified. 2015-04-14 14:50:56 +02:00
Zbigniew Motyka
bf2db3ec03 Fix error message 2015-04-14 10:20:07 +02:00
Douwe Maan
17e2310878 Add instructions to Google Code import page. 2015-04-03 16:02:39 +02:00
Douwe Maan
7b5bc32cad Allow projects to be imported from Google Code. 2015-04-03 15:29:27 +02:00
Dmitriy Zaporozhets
a1d09190e3 Prevent unnecessary doubling of js events on import pages and user calendar 2015-03-25 21:45:01 -07:00
Dmitriy Zaporozhets
dd78cd1ce4 Style improvements to import page 2015-03-12 10:04:09 -07:00
Douwe Maan
d3c44b1a6c Fix import status page project links for new Rails. 2015-02-26 09:50:43 +01:00
Dmitriy Zaporozhets
a52529f9b6 Merge branch 'bitbucket-import'
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
2015-02-25 09:21:45 -08:00
Douwe Maan
46bcf40b2c Add ".org" back to Gitorious mentions. 2015-02-24 15:08:42 +01:00
Douwe Maan
bc80efb1fd Bring Gitorious import page in line with others. 2015-02-24 15:07:25 +01:00
Douwe Maan
20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan
a938b3eeb4 Link to original repo on import status pages. 2015-02-24 15:07:24 +01:00
Douwe Maan
ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Marcin Kulik
f6add983d3 Use proper Gitorious icons on import pages 2015-02-24 09:42:07 +00:00
Marcin Kulik
157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00:00
Douwe Maan
db7921f2d8 Add "Import all projects" button to GitHub and GitLab import pages.
Closes #1963.
2015-02-07 23:15:04 +01:00
Valery Sizov
1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00
Valery Sizov
33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00