Dmitriy Zaporozhets
de073cf5ac
Merge branch 'services_refactoring1' into 'master'
...
Services: code style fixes, minor refactoring
## What does this MR do?
It contains code style fixes, minor refactoring and also it removes some unnecessary comments. Every comment require a support just like a regular code line and this is why we should avoid using comments everywhere unless it's really helpful. Martin Fowler said "Find comment and refactor the code around it" :) our code is not that bad so let's not spoil it with comments.
## Why was this MR needed?
Because GitLab is a live example of awesome code. Let's keep up a good job :)
See merge request !5112
2016-07-07 06:08:12 +00:00
Valery Sizov
3baed8cb6d
Services: code style fixes, minor refactoring
2016-07-06 20:58:43 +03:00
Douwe Maan
22780c4ac3
Merge branch '15094-throttling-pushes_since_gc' into 'master'
...
Throttle the update of `project.pushes_since_gc` to 1 minute
## What does this MR do?
Throttle the update of `project.pushes_since_gc` to alleviate DB load
## What are the relevant issue numbers?
Relates to #15094
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG ) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md )~~
- ~~[ ] API support added~~
- Tests
- ~~[ ] Added for this feature/bug~~
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
See merge request !5083
2016-07-06 15:53:04 +00:00
James Lopez
4a62a11f20
add more debug info to project export
2016-07-05 16:58:42 +02:00
Paco Guzman
d91c6c0738
Throttle the update of project.pushes_since_gc to 1 minute
2016-07-05 10:09:47 +02:00
Grzegorz Bizon
9e211091a8
Enable Style/EmptyLines cop, remove redundant ones
2016-07-01 21:56:17 +02:00
Alejandro Rodríguez
86359ec854
Refactor repository paths handling to allow multiple git mount points
2016-06-29 22:30:31 -04:00
James Lopez
cee2a2dc66
fixed a couple of errors spotted in production
2016-06-20 08:58:43 +02:00
Douwe Maan
9b7fd74805
Merge branch 'feature/project-export' into 'master'
...
Export project functionality
This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050 , which adds the ability to export single projects.
- [x] members
- DB data
- [x] issues
- [x] issue comments
- [x] merge requests
- [x] merge request diff
- [x] merge request comments
- [x] labels
- [x] milestones
- [x] snippets
- [x] releases
- [x] events
- [x] commit statuses
- [x] CI builds
- File system data
- [x] Git repository
- [x] wiki
- [x] uploads
- [ ] ~~CI build traces~~
- [ ] ~~CI build artifacts~~
- [ ] ~~LFS objects~~
- DB configuration
- [x] services
- [x] web hooks
- [x] protected branches
- [x] deploy keys
- [x] CI variables
- [x] CI triggers
See merge request !3114
2016-06-17 15:35:27 +00: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
b53ed84843
adapted current services stuff to use new project import, plus fixes a few issues, updated routes, etc...
2016-06-14 20:32:19 +02:00
James Lopez
9ecebaaea1
adding notifications stuff and more refactoring for exporting projects
2016-06-14 16:31:03 +02:00
James Lopez
3f7ed55011
lots of refactoring to reuse import service
2016-06-14 12:47:07 +02:00
Fatih Acet
046b5735bc
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplete_for_labels
...
# Conflicts:
# app/assets/javascripts/gfm_auto_complete.js.coffee
2016-06-14 00:56:59 +03:00
James Lopez
9d0038f2d7
started refactoring a bunch of stuff based on feedback
2016-06-03 12:56:29 +02:00
James Lopez
398f0071a6
merge hell
2016-06-03 11:17:46 +02:00
James Lopez
721014c927
Revert "Fix merge conflicts - squashed commit"
...
This reverts commit 3e99123095 .
2016-06-03 11:10:17 +02:00
James Lopez
3e99123095
Fix merge conflicts - squashed commit
...
# Conflicts:
# app/models/project.rb
2016-06-03 10:57:49 +02:00
James Lopez and Robert Speicher
097eafc8c7
fix some issues and improved error output for forking
2016-06-02 21:48:26 -04:00
James Lopez and Robert Speicher
b2b3e0e6ee
fix empty message on shell error
2016-06-02 21:47:39 -04:00
James Lopez and Robert Speicher
b2b2b2f9de
fix create service error handling - missing setting import status to failed
2016-06-02 21:47:38 -04:00
Grzegorz Bizon
a55e8f109f
Enable Style/NegatedIf Rubocop cop
...
Favor `unless` over `if` for negative conditions
(or control flow ||).
See #17478
2016-05-30 13:53:25 +02:00
Felipe Artur
5273335247
Fix forks creation when visibility level is restricted
2016-05-25 10:57:00 -04:00
James Lopez
30f4dcd4c9
uploads export
2016-05-19 13:02:57 +02:00
Rémy Coutable
f29d8b64e4
Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md
...
Signed-off-by: Rémy Coutable <remy@rymai.me >
2016-05-18 23:40:33 -05:00
Kamil Trzciński
08fddae744
Merge branch 'docker-registry-view' into 'master'
...
Add container registry support
Tasks:
- [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787
- [x] Implement Docker Registry API
- [x] Show a list of docker images in GitLab
- [x] Remove registry repository on project deletion
- [x] Support project rename, move and namespace rename
- [x] Use token when connecting the registry
- [x] Allow to delete images from GitLab
- [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN)
- [x] Support GitLab Runner pulling for public repositories
- [ ] Support GitLab Runner pulling for private repositories
- [x] Add tests for Docker Registry API
- [x] Add tests for a views
- [x] Make texts nicer
- [x] Implement a backup support
- [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141
- [ ] Create user documentation
See merge request !4040
2016-05-18 18:19:01 +00:00
James Lopez
5777ad9a1f
adding versioning to export
2016-05-16 12:04:31 +02:00
Kamil Trzcinski
f4f59d0f13
Merge branch 'docker-registry' into docker-registry-view
2016-05-13 17:15:01 -05:00
Kamil Trzcinski
9e318bd99d
Fix container registry permissions
2016-05-13 12:20:23 -05:00
James Lopez
8eb67187d0
removed transaction stuff
2016-05-13 13:12:21 +02:00
Kamil Trzcinski
5c2f2fd289
Fix CI tests
2016-05-12 13:03:04 -05:00
James Lopez
cacbecd05c
more changes based on MR feedback
2016-05-12 18:27:20 +02:00
James Lopez
f4ab8ea496
rename method
2016-05-12 17:16:35 +02:00
James Lopez
ef7f793dc4
fix silly typo
2016-05-12 10:12:29 +02:00
James Lopez
1074980abb
Merge branches 'fix/import-data-issue' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue
2016-05-11 17:54:25 +02:00
James Lopez
5c59ba35c9
fix complexity of method
2016-05-11 15:08:27 +02:00
James Lopez
cffae0d22e
fixing more export problems
2016-05-11 14:51:25 +02:00
James Lopez
68aca6f663
trying to fix timing issue with import status
2016-05-11 11:37:49 +02:00
Stan Hu
f2548f3f2b
Improve log message when a project is destroyed to include the namespace
2016-05-10 22:07:13 -07:00
James Lopez
a5d59f075a
added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver
2016-05-10 17:15:20 +02:00
James Lopez
1322c981a0
create import data in service
2016-05-10 11:10:51 +02:00
Kamil Trzcinski
d05f0030a3
Added Docker Registry View tests
2016-05-09 23:32:18 +03:00
Kamil Trzcinski
d5d8e76bd7
Block renaming project or repository if it has container registry tags
2016-05-09 22:41:48 +03:00
Kamil Trzcinski
565a5e36fc
Merge branch 'docker-registry' into docker-registry-view
2016-05-09 22:12:34 +03:00
James Lopez
3f87387b6f
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
...
# Conflicts:
# app/models/project.rb
2016-05-09 12:19:33 +02:00
Stan Hu
a65de9c2c1
Reduce delay in destroying a project from 1-minute to immediately
...
Run ProjectDestroyWorker after pending_delete attribute has been committed to DB
2016-05-07 01:12:31 -07:00
James Lopez
ce598b0541
fixed and refactored a few things based on MR feedback
2016-05-06 13:40:02 +02:00
James Lopez
6612ca096a
update repo and wiki repo bundler to use git bundle instead of compressing via tar
2016-05-05 12:01:18 +02:00
Kamil Trzcinski
7168493e8a
Remove container registry on project removal
2016-05-04 14:35:18 +02:00
Arinde Eniola
14964308dc
add gfm autocomplete for labels
2016-05-03 12:07:06 +01:00