Commit Graph
26611 Commits
Author SHA1 Message Date
James Lopez ae777ea061 WIP - importing file and repo 2016-04-15 18:14:28 +02:00
James Lopez 97c3aff16f refactored import stuff, moved to lib 2016-04-14 17:10:57 +02:00
James Lopez adbcccb4dd Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-04-14 16:58:52 +02:00
James Lopez 0852f539aa refactored stuff, added a save and compress all class and moved mostly everything to lib 2016-04-14 16:57:25 +02:00
James Lopez 267fd01ce8 fixed import and spec is now passing! 2016-04-13 17:47:14 +02:00
James Lopez 36ba23d131 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-04-12 18:22:01 +02:00
James Lopez 91ffd80289 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-04-12 18:18:56 +02:00
James Lopez 6f74c7d482 fix export commits stuff 2016-04-12 18:06:57 +02:00
Jacob Schatz 2082879d2f Merge branch 'commit-message-prefilled' into 'master'
Prefills commit message in edit file

See #14488 

![Screen_Shot_2016-04-06_at_10.18.06](/uploads/2ace2a21a6ead8d83c79ef9ce5dd34cc/Screen_Shot_2016-04-06_at_10.18.06.png)

See merge request !3564
2016-04-12 15:53:14 +00:00
Jacob Schatz 63265243b5 Merge branch 'build-notification-fixes' into 'master'
Build notification null check

Cancels build notification interval on page change

See merge request !3540
2016-04-12 15:49:33 +00:00
Robert Speicher d75ec6cd46 Merge branch 'fix-missing-saml-error-handling' into 'master'
Add proper nil and error handling to SAML login process

While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks.

I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check.

See merge request !3609
2016-04-12 15:46:39 +00:00
Rémy Coutable d65d5c2d1a Merge branch 'feature/fix-14753' into 'master'
Fix #14753: Check if head is born before trying to detect main language

This MR makes sure that head exists before trying to detect the main language.
This prevents errors on repo's without a master branch.

Closes #14753

See merge request !3654
2016-04-12 15:34:56 +00:00
James Lopez 0d8a97dcef some more fixes to import projects 2016-04-12 17:10:30 +02:00
Jeroen Bobbeldijk c870686589 Add my name 2016-04-12 16:44:12 +02:00
Rémy Coutable 0b8852d3c4 Merge branch 'instrument-service-classes' into 'master'
Instrument all service classes

This will help us see where (mostly) Sidekiq code is spending time.

See merge request !3675
2016-04-12 14:39:54 +00:00
Rémy Coutable 13201a3a05 Merge branch 'hide_help_block_when_creating_project_inside_group' into 'master'
Hide help block when user is creating a new project inside a group

closes #14092 

![fix](/uploads/13721117c410c8fe6937d44a3b0a90a8/fix.gif)

See merge request !3427
2016-04-12 14:39:17 +00:00
Rémy Coutable e322b993e7 Merge branch 'api-delete-note' into 'master'
Delete notes via API

Supports deleting issues, snippets, and merge requests via the API.

* Closes #14944
* Closes #14845 
* Closes #6060 

@zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet.

@rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. 


See merge request !3557
2016-04-12 14:34:50 +00:00
Yorick Peterse 435892ed43 Changelog entry for service class instrumentation
[ci skip]
2016-04-12 16:07:58 +02:00
Rémy Coutable a5512099ce Merge branch 'api-get-tag' into 'master'
API: Ability to retrieve a single tag

* Closes #14330

/cc @dblessing

See merge request !3577
2016-04-12 14:04:40 +00:00
Rémy Coutable 01d4995ae6 Merge branch 'remove-myself-from-project-api-7687' into 'master'
Allow a project member to leave the projected through the API

Closes #7687 


See merge request !3613
2016-04-12 13:43:35 +00:00
Robert Schilling dc39c8372d Adapt tests to new testing guidelines 2016-04-12 15:43:29 +02:00
Arinde Eniola 050110c9c9 hide help block when user is creating a new project inside a group 2016-04-12 14:41:34 +01:00
James Lopez c94c0dc0c7 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-04-12 15:34:36 +02:00
James Lopez 3b99e4ae5b add issue and MR comments to default export. Fix spec 2016-04-12 15:32:25 +02:00
Robert Schilling 08a217cfcf Add changelog entry 2016-04-12 15:28:09 +02:00
Rémy Coutable e933a0b058 Merge branch 'uninstrument-banzai-reference-extractor' into 'master'
Un-instrument Banzai::ReferenceExtractor

No changelog entry since this isn't really something new compared to 8.6, instead it adjusts something that was added for 8.7.

See merge request !3676
2016-04-12 13:23:49 +00:00
Zeger-Jan van de Weg 6dbcb880cc Allow a project member to leave the projected through the API 2016-04-12 14:30:42 +02:00
Robert Schilling 49484f9a2c Fix changelog entry 2016-04-12 14:26:20 +02:00
Robert Schilling 9aefaa41ab Fix code review issues 2016-04-12 14:24:05 +02:00
Robert Schilling ba21c00f01 Delete notes via API 2016-04-12 14:24:05 +02:00
Robert Schilling f81352f531 Fix minor styling issues from code review 2016-04-12 14:12:30 +02:00
Yorick Peterse b3d8b995c3 Un-instrument Banzai::ReferenceExtractor
Instrumenting this class together with Gitlab::ReferenceExtractor causes
a StackError for some reason. Since Gitlab::ReferenceExtractor has most
of the interesting code we'll only instrument that class.
2016-04-12 14:10:35 +02:00
Rémy Coutable 734df1bb50 Merge branch 'api-fix-milestone-iid-filter' into 'master'
API: Add iid filter to milestones

This was documented in the API docs but it was never working because the iid filter was never applied to the milestones. The tests were working by accident because the were checking the first element, which was by accident the request element. 

* Closes https://github.com/gitlabhq/gitlabhq/issues/10122

See merge request !3588
2016-04-12 11:23:12 +00:00
Rémy Coutable 25998f57a8 Merge branch 'api-notes-date' into 'master'
API: Expose updated_at for notes

* Closes #7954

See merge request !3560
2016-04-12 11:19:36 +00:00
James Lopez 495397793e fix spec 2016-04-12 12:57:00 +02:00
Robert Schilling 20d4ca4cc3 API: Ability to retrieve a single tag 2016-04-12 12:38:59 +02:00
Robert Schilling 9d03e8fd5c API: Add iid filter to milestones 2016-04-12 12:37:16 +02:00
Robert Schilling 10080ce362 API: Expose updated_at for notes 2016-04-12 12:32:34 +02:00
James Lopez eb55cb927b more refactoring 2016-04-12 12:24:40 +02:00
Yorick Peterse 8299129382 Instrument all service classes
Fixes gitlab-org/gitlab-ce#15162
2016-04-12 12:24:16 +02:00
James Lopez 4ffcd42780 import working! 2016-04-12 11:42:37 +02:00
James Lopez dbf755ae56 small fix 2016-04-12 11:34:58 +02:00
Rémy Coutable 8cb41f1989 Merge branch 'api-labels-info' into 'master'
API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels

Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238

See merge request !3569
2016-04-12 09:21:00 +00:00
James Lopez da60baf2a5 fixing more importing issues 2016-04-12 10:36:18 +02:00
Robert Speicher 0913204f9b Merge branch 'issue_1752' into 'master'
Fix milestone removal problem when editing issues

fixes #1752 

See merge request !3571
2016-04-11 23:26:45 +00:00
Patricio Cano 05a611a091 Better control flow and added guard clause. 2016-04-11 17:25:18 -05:00
Phil Hughes 44a95c5dea Added back text used on merge commit message 2016-04-11 17:41:47 +01:00
Phil Hughes 6333ebe619 Prefills commit message in edit file
See #14488
2016-04-11 17:40:36 +01:00
James Lopez 56fc58930c more refactoring to use dynamic import 2016-04-11 18:30:54 +02:00
Phil Hughes 1b4a56bdb0 Fixed failing tests 2016-04-11 17:28:54 +01:00