summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0714-20/+215
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| * | | | | | | fix some issues with credentialsJames Lopez2016-04-062-7/+7
| | | | | | | |
| * | | | | | | some refactoring to symbolise keys across importers and left a TODOJames Lopez2016-04-055-13/+13
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-052-0/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0444-259/+455
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb
| * | | | | | | | | corrected a couple of based on MR reviewJames Lopez2016-04-041-2/+1
| | | | | | | | | |
| * | | | | | | | | remove useless varJames Lopez2016-04-011-1/+0
| | | | | | | | | |
| * | | | | | | | | fixes after more import testingJames Lopez2016-04-012-2/+2
| | | | | | | | | |
| * | | | | | | | | fix github import issuesJames Lopez2016-04-011-1/+1
| | | | | | | | | |
| * | | | | | | | | fix fogbugz importJames Lopez2016-04-012-9/+8
| | | | | | | | | |
| * | | | | | | | | more fixes after doing more manual testing on importingJames Lopez2016-03-292-2/+4
| | | | | | | | | |
| * | | | | | | | | fixing a few issues after testing importsJames Lopez2016-03-293-13/+10
| | | | | | | | | |
| * | | | | | | | | fixed failing specsJames Lopez2016-03-291-1/+5
| | | | | | | | | |
| * | | | | | | | | refactored code based on feedback plus fixed a couple of other issuesJames Lopez2016-03-286-41/+36
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-285-25/+100
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| * | | | | | | | | | added rest of importers, fixed specs and some issues with the migrationJames Lopez2016-03-232-9/+13
| | | | | | | | | | |
| * | | | | | | | | | fogbugz importer, also refactored migration again to make it easier to add ↵James Lopez2016-03-232-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new importers
| * | | | | | | | | | fix rubocop warningJames Lopez2016-03-221-2/+0
| | | | | | | | | | |
| * | | | | | | | | | fix gitlab import and specJames Lopez2016-03-222-5/+7
| | | | | | | | | | |
| * | | | | | | | | | first round of fixes and spec fixesJames Lopez2016-03-224-31/+32
| | | | | | | | | | |
| * | | | | | | | | | encrypt credentials in project_creator for bitbucket by defaultJames Lopez2016-03-221-1/+1
| | | | | | | | | | |
| * | | | | | | | | | update bitbucket importerJames Lopez2016-03-222-6/+13
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-226-11/+29
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-213-1/+97
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb
| * | | | | | | | | | | | refactored code based on feedbackJames Lopez2016-03-211-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | fixed some rubocop warningsJames Lopez2016-03-211-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | fixed few issues with the migrationJames Lopez2016-03-211-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | more refactoringJames Lopez2016-03-214-19/+25
| | | | | | | | | | | | |
| * | | | | | | | | | | | some refactoring based on feedbackJames Lopez2016-03-214-16/+28
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branches 'fix/project-import_url' and 'master' of ↵James Lopez2016-03-2142-215/+671
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url # Conflicts: # db/schema.rb
| * | | | | | | | | | | | | refactored a bunch of stuff based on MR feedbackJames Lopez2016-03-073-13/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix specsJames Lopez2016-03-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | added import url exposer to construct URL withunencrypted credentialsJames Lopez2016-03-044-5/+23
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | some refactoring in the migration. Also fixed github import issue and ↵James Lopez2016-03-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated spec
* | | | | | | | | | | | | | Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' Robert Speicher2016-04-151-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use rugged to change HEAD _Originally opened at !2850 by @pmq20._ Needless to invoke gitlab_shell here, which is slow. See merge request !3705
| * | | | | | | | | | | | | | Remove Gitlab::Shell#update_repository_head since it's not used anymorepmq20/gitlab-ce-psvr/change-headRémy Coutable2016-04-151-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch 'rugged-delete-tag' into 'master' Rémy Coutable2016-04-151-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete tags via rugged Improve the performance by directly using rugged instead of shelling out to a git operation. See merge request !3748
| * | | | | | | | | | | | | | | Delete tags via ruggedRobert Schilling2016-04-151-13/+0
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Remove unused backend methodsRobert Schilling2016-04-151-27/+0
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'remove-ci-nginx-config' into 'master' Robert Speicher2016-04-141-29/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated NGINX CI config [ci skip] See merge request !3728
| * | | | | | | | | | | | | | Remove deprecated NGINX CI configAchilleas Pipinellis2016-04-141-29/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'emoji_category_fix' into 'master' Robert Speicher2016-04-141-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji categories fix Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020 See merge request !3727
| * | | | | | | | | | | | | | | Emoji categories fixValery Sizov2016-04-141-3/+13
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-142-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
| * | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-1311-13/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-1227-48/+408
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add a 'circuit breaker' for repo checksJacob Vosmaer2016-04-121-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename almost all the thingsJacob Vosmaer2016-04-061-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rebase repo check MRJacob Vosmaer2016-04-041-0/+7
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' Rémy Coutable2016-04-141-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix revoking of authorized OAuth applications Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized. Added a spec and also found that the `gon` variables were not being set for this view. Closes #14370 See merge request !3690