summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/project-import_url' into 'master' Robert Speicher2016-04-152-1/+42
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-152-2/+3
| |\
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-1417-140/+128
| |\ \
| * | | changed a few things based on feedbackJames Lopez2016-04-111-2/+6
| * | | fix create_or_update_import_dataJames Lopez2016-04-071-1/+4
| * | | refactored create_or_update_import_dataJames Lopez2016-04-071-16/+7
| * | | refactored a few things based on MR feedbackJames Lopez2016-04-071-0/+13
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-072-4/+14
| |\ \ \
| * | | | removed TODO [ci skip]James Lopez2016-04-061-1/+0
| * | | | fix some issues with credentialsJames Lopez2016-04-061-2/+2
| * | | | some refactoring to symbolise keys across importers and left a TODOJames Lopez2016-04-051-2/+6
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-0419-60/+87
| |\ \ \ \
| * | | | | fix github import issuesJames Lopez2016-04-011-1/+1
| * | | | | fix fogbugz importJames Lopez2016-04-011-0/+4
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-289-13/+32
| |\ \ \ \ \
| * | | | | | first round of fixes and spec fixesJames Lopez2016-03-221-2/+3
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-228-43/+101
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-216-13/+57
| |\ \ \ \ \ \ \
| * | | | | | | | fix import data creationJames Lopez2016-03-211-2/+1
| * | | | | | | | refactored code based on feedbackJames Lopez2016-03-211-2/+8
| * | | | | | | | fixed some rubocop warningsJames Lopez2016-03-211-1/+1
| * | | | | | | | fixed few issues with the migrationJames Lopez2016-03-212-2/+3
| * | | | | | | | more refactoringJames Lopez2016-03-211-4/+8
| * | | | | | | | some refactoring based on feedbackJames Lopez2016-03-211-0/+12
| * | | | | | | | Merge branches 'fix/project-import_url' and 'master' of gitlab.com:gitlab-org...James Lopez2016-03-2138-409/+811
| |\ \ \ \ \ \ \ \
| * | | | | | | | | refactored a bunch of stuff based on MR feedbackJames Lopez2016-03-071-1/+1
| * | | | | | | | | fix specsJames Lopez2016-03-041-2/+1
| * | | | | | | | | added import url exposer to construct URL withunencrypted credentialsJames Lopez2016-03-041-0/+1
| * | | | | | | | | WIP - refactored migration and updated project_import_data with encrypted attJames Lopez2016-03-032-2/+2
| * | | | | | | | | add initial migrationsJames Lopez2016-03-021-0/+1
* | | | | | | | | | Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' Robert Speicher2016-04-151-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use rugged to change HEADP.S.V.R2016-04-131-1/+3
* | | | | | | | | | | Delete tags via ruggedRobert Schilling2016-04-151-1/+6
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge branch 'rs-trailing-slash-in-search' into 'master' Douwe Maan2016-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Escape the query argument provided to `git grep` by `search_files`rs-trailing-slash-in-searchRobert Speicher2016-04-091-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-141-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-1312-108/+72
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-124-17/+18
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add repository_checks_enabled settingJacob Vosmaer2016-04-121-1/+2
* | | | | | | | | | | Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' Rémy Coutable2016-04-141-0/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-141-0/+19
* | | | | | | | | | | | Merge branch 'start-with-iid-on-new-branch' into 'master' Rémy Coutable2016-04-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Start with iid on branch creationZeger-Jan van de Weg2016-04-141-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'simplify-gitlab-url_builder-15202' into 'master' Rémy Coutable2016-04-141-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-131-5/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Allow empty recipient list when pusher is addedFrank Groeneveld2016-04-141-3/+7
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' Robert Speicher2016-04-131-10/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix a bug with trailing slash in bamboo_urlRémy Coutable2016-04-131-10/+10
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' Robert Speicher2016-04-131-14/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515Rémy Coutable2016-04-131-3/+3
View Lorry Controller Status