home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,846 Commits 48 Branches 340 Tags
master
Commit Graph
55 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 8353cc6111 Fix import button when import fail due the namespace already been taken 2016-07-01 16:04:24 -03:00
Rémy Coutable ce6635406c Make GH one-off auth the default again for importing GH projects 
Advertise the PAT as an alternative unless GH import is not configured.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-30 18:48:17 +02:00
Eric K IdemaandRémy Coutable 12aa1f898d Import from Github using Personal Access Tokens. 
This stands as an alternative to using OAuth to access a user's Github
repositories.  This is setup in such a way that it can be used without OAuth
configuration.

From a UI perspective, the how to import modal has been replaced by a full
page, which includes a form for posting a personal access token back to the
Import::GithubController.

If the user has logged in via GitHub, skip the Personal Access Token and go
directly to Github for an access token via OAuth.
 2016-06-30 18:48:17 +02:00
Douglas Barbosa Alexandre 6ec5044f74 Warn about admin privilege to disable GitHub Webhooks 
[ci skip]
 2016-06-17 18:18:52 -03:00
James Lopez 4bde59341f lots of refactoring again based on feedback. Changed the UI slightly and also fixed a small bug 2016-06-15 17:31:00 +02:00
James Lopez cbd0201fdb fixing specs and some code cleanup 2016-06-15 10:37:17 +02:00
James Lopez 903da37755 WIP - starting refactoring import/export to use services 2016-06-13 20:35:57 +02:00
James Lopez e83fc684a5 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 
# Conflicts:
#	Gemfile.lock
#	app/helpers/todos_helper.rb
#	app/models/todo.rb
#	app/views/projects/edit.html.haml
#	lib/gitlab/import_export/import_service.rb
 2016-06-13 14:00:19 +02:00
Douglas Barbosa Alexandre 17152602b0 Add a message warning user that Webhooks will be disabled 2016-06-06 12:07:45 -03:00
Phil Hughes 7ab09fdb78 Fixed issue with GitLab import buttons having a spinner 
Closes #17232
 2016-05-24 15:00:25 +01:00
James Lopez e5ee7e8692 typos in export page 2016-05-04 11:10:25 +02:00
James Lopez 17cfce7adc typo 2016-05-03 15:09:28 +02:00
James Lopez fc329696e2 typo 2016-05-03 13:40:49 +02:00
James Lopez 07ab6c2e26 refactoring and fixing a bunch of stuff 2016-05-02 11:29:21 +02:00
James Lopez 34c826a311 some JS magic to pass namespace and path importing projects 2016-04-27 15:01:55 +02:00
James Lopez cbbc42e0c4 adding more UI changes, updated controller, worker and refactored import service 2016-04-26 17:12:50 +02:00
James Lopez 1d4c3fa150 more refactoring, now using custom job for processing project imports 2016-04-26 13:01:51 +02:00
James Lopez 28b0208e93 refactoring, mainly UI stuff to follow other import actions 2016-04-26 10:59:00 +02:00
Douglas Barbosa Alexandre 835acf22d4 Fix GitHub project's link on import page when provider has a custom URL 2016-04-19 13:21:30 -03:00
Phil Hughes 3d438870f3 Updated based on feedback 2016-04-14 09:32:02 +01:00
Phil Hughes a650af1226 Moved loading icon to match todo loading icon 2016-04-12 09:48:39 +01:00
Phil Hughes 3cfbd2b160 Added loading icon to import buttons 
See #14488 for more details
 2016-04-11 18:27:34 +01:00
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