summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | merge hellJames Lopez2016-06-0334-233/+570
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-0334-570/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.
| | | * | | | | | | Fix merge conflicts - squashed commitJames Lopez2016-06-0334-233/+570
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/project.rb
| | | * | | | | | | updated uploads saverJames Lopez2016-05-191-3/+8
| | | | | | | | | |
| | | * | | | | | | fix pathJames Lopez2016-05-191-1/+1
| | | | | | | | | |
| | * | | | | | | | refactoring more things based on MR feedbackJames Lopez2016-06-024-7/+13
| | | | | | | | | |
| | * | | | | | | | refactoring relation factory, changed from module to classJames Lopez2016-06-022-58/+72
| | | | | | | | | |
| | * | | | | | | | more and more refactoringJames Lopez2016-06-026-46/+41
| | | | | | | | | |
| | * | | | | | | | started refactoring some stuff based on MR feedbackJames Lopez2016-06-014-49/+37
| | | | | | | | | |
| * | | | | | | | | a few nice to have and updated changelogJames Lopez2016-05-201-0/+13
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-05-192-5/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | fix extra spaceJames Lopez2016-05-191-1/+0
| | | | | | | | | |
| | * | | | | | | | fixed small issue mapping membersJames Lopez2016-05-192-4/+3
| | | | | | | | | |
| * | | | | | | | | fix merge conflictsJames Lopez2016-05-196-8/+48
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | import uploads. Fixed a few things to do with members, triggers, etc...James Lopez2016-05-196-8/+48
| | | | | | | | | |
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-191-0/+35
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | | * | | | | | | uploads exportJames Lopez2016-05-191-0/+35
| | | | | | | | | |
| * | | | | | | | | Squashed commit of the following:James Lopez2016-05-191-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 92de6309e1c918a4ae023641dc42b196b3fb25ea Merge: 6c082ed 30f4dcd Author: James Lopez <james@jameslopez.es> Date: Thu May 19 13:06:34 2016 +0200 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import commit 30f4dcd4c906a71db98833075c76eb59922f5b98 Author: James Lopez <james@jameslopez.es> Date: Thu May 19 13:02:57 2016 +0200 uploads export
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-05-181-1/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | fixed issue exporting buildsJames Lopez2016-05-181-1/+14
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-05-184-5/+15
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | fix rubocop warningJames Lopez2016-05-181-1/+0
| | | | | | | | | |
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-183-4/+15
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | | * | | | | | | fixed CI commits on exportJames Lopez2016-05-183-4/+15
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-05-182-2/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-181-1/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | | * | | | | | | updated import export confJames Lopez2016-05-181-1/+0
| | | | | | | | | |
| | * | | | | | | | update relation factory with new models exceptionsJames Lopez2016-05-181-1/+9
| | | | | | | | | |
| | * | | | | | | | revert changes as builds are related to statuses which are already thereJames Lopez2016-05-183-106/+23
| | | | | | | | | |
| | * | | | | | | | added commits mapper and DB config import stuffJames Lopez2016-05-183-23/+106
| | | | | | | | | |
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-181-0/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| * | | | | | | | | Merge branches 'feature/project-export' and ↵James Lopez2016-05-181-0/+7
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | 'feature/project-export-ui-experimental' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | added DB configurationJames Lopez2016-05-181-0/+7
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-05-171-0/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-171-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | | * | | | | | | fix specsJames Lopez2016-05-171-0/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵James Lopez2016-05-161-2/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | into feature/project-export-ui-experimental
| | * | | | | | | | fix issue with forked MRsJames Lopez2016-05-161-2/+10
| | | | | | | | | |
| * | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵James Lopez2016-05-164-4/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | into feature/project-export-ui-experimental
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-163-2/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | | * | | | | | | fix version issueJames Lopez2016-05-163-2/+7
| | | | | | | | | |
| | * | | | | | | | fix versionJames Lopez2016-05-161-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-05-164-1/+77
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | missing new lineJames Lopez2016-05-161-0/+1
| | | | | | | | | |
| | * | | | | | | | added version check on importJames Lopez2016-05-163-2/+42
| | | | | | | | | |
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-162-0/+35
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | | * | | | | | | adding versioning to exportJames Lopez2016-05-162-0/+35
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-05-164-9/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | | | | fix merge conflictsJames Lopez2016-05-164-9/+13
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | some changes based on MR feedbackJames Lopez2016-05-164-9/+13
| | | | | | | | | |