summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-171-1/+11
|\ | | | | | | | | Cache todo counters (pending/done) See merge request !4438
| * Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-1/+11
| | | | | | | | | | | | | | - As todos are created/updated inside the TodoService we repopulate the cache just there for both pending/done todos - Todos as mark as done from the TodosController we update cache there too - All the added methods are kept in the User class for cohesion
* | Fix a 'wrong number of arguments' errorRémy Coutable2016-06-171-1/+1
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-171-1/+6
|\ | | | | | | | | | | | | Fix error when editing an issuable with a task list Closes #18712 See merge request !4751
| * Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-171-1/+6
| |
* | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-174-13/+87
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * fixed merge conflicts on UI branchJames Lopez2016-06-166-27/+85
| |\
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-exportJames Lopez2016-06-166-27/+85
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export # Conflicts: # app/models/ci/pipeline.rb
| | * | Revert "squashed merge and fixed conflicts"James Lopez2016-06-166-85/+27
| | | | | | | | | | | | | | | | This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
| | * | squashed merge and fixed conflictsJames Lopez2016-06-166-27/+85
| | | |
| * | | lots of refactoring again based on feedback. Changed the UI slightly and ↵James Lopez2016-06-151-5/+7
| | | | | | | | | | | | | | | | also fixed a small bug
| * | | adapted current services stuff to use new project import, plus fixes a few ↵James Lopez2016-06-141-10/+14
| | | | | | | | | | | | | | | | issues, updated routes, etc...
| * | | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-143-4/+21
| | | |
| * | | lots of refactoring to reuse import serviceJames Lopez2016-06-142-3/+8
| |/ /
| * | Merge branches 'feature/project-export' and 'master' of ↵James Lopez2016-06-1315-45/+102
| |\ \ | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-export
| * | | started refactoring a bunch of stuff based on feedbackJames Lopez2016-06-031-15/+18
| | | |
| * | | merge hellJames Lopez2016-06-0326-87/+342
| |\ \ \
| * | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-0326-342/+87
| | | | | | | | | | | | | | | | | | | | This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.
| * | | | Fix merge conflicts - squashed commitJames Lopez2016-06-0326-87/+342
| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/project.rb
| * | | | uploads exportJames Lopez2016-05-191-1/+5
| | | | |
| * | | | adding versioning to exportJames Lopez2016-05-161-3/+8
| | | | |
| * | | | fixing more export problemsJames Lopez2016-05-111-1/+1
| | | | |
| * | | | added better error handling. Also refactored some of the code and fixed a ↵James Lopez2016-05-101-2/+6
| | | | | | | | | | | | | | | | | | | | few issues in project_tree_saver
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-05-098-49/+63
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export # Conflicts: # app/models/project.rb
| * | | | | fixed and refactored a few things based on MR feedbackJames Lopez2016-05-061-4/+1
| | | | | |
| * | | | | update repo and wiki repo bundler to use git bundle instead of compressing ↵James Lopez2016-05-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | via tar
| * | | | | Merge branches 'feature/project-export' and 'master' of ↵James Lopez2016-05-036-3/+53
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-export
| * | | | | | picking export stuff from the UI branchJames Lopez2016-05-031-1/+2
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-2121-135/+250
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export
| * | | | | | | refactored stuff, added a save and compress all class and moved mostly ↵James Lopez2016-04-149-293/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | everything to lib
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-123-6/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export
| * | | | | | | | fix export commits stuffJames Lopez2016-04-122-3/+3
| | | | | | | | |
| * | | | | | | | add issue and MR comments to default export. Fix specJames Lopez2016-04-123-7/+7
| | | | | | | | |
| * | | | | | | | fix rubocop warningsJames Lopez2016-04-081-7/+7
| | | | | | | | |
| * | | | | | | | using new configJames Lopez2016-04-074-24/+19
| | | | | | | | |
| * | | | | | | | continuing to refactor config, added spec and fixed a few problemsJames Lopez2016-04-072-8/+45
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0634-139/+510
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export
| * | | | | | | | | started refactored the dynamic rules to be defined in a yml fileJames Lopez2016-04-062-0/+78
| | | | | | | | | |
| * | | | | | | | | fix project snippets json issueJames Lopez2016-03-141-1/+5
| | | | | | | | | |
| * | | | | | | | | added commits and merge request diffs to exportJames Lopez2016-03-141-2/+10
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export' and 'master' of ↵James Lopez2016-03-146-9/+27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-export
| * | | | | | | | | | add id to project member user jsonJames Lopez2016-03-111-1/+1
| | | | | | | | | | |
| * | | | | | | | | | fix project members json to include userJames Lopez2016-03-111-1/+5
| | | | | | | | | | |
| * | | | | | | | | | fix project members exportJames Lopez2016-03-111-2/+2
| | | | | | | | | | |
| * | | | | | | | | | add project members to exportJames Lopez2016-03-101-1/+1
| | | | | | | | | | |
| * | | | | | | | | | fix wiki path issues and specJames Lopez2016-03-092-1/+5
| | | | | | | | | | |
| * | | | | | | | | | fix new line issueJames Lopez2016-03-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | WIP - added wiki repo bundlerJames Lopez2016-03-082-0/+36
| | | | | | | | | | |
| * | | | | | | | | | added repo bundler spec and refactored some of the export codeJames Lopez2016-03-084-7/+8
| | | | | | | | | | |
| * | | | | | | | | | WIP - started working on bundle the repo, refactored some stuff and updated specJames Lopez2016-03-085-8/+72
| | | | | | | | | | |
View Lorry Controller Status