Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-07 | 14 | -20/+215 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * | | | | | | | fix some issues with credentials | James Lopez | 2016-04-06 | 2 | -7/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | some refactoring to symbolise keys across importers and left a TODO | James Lopez | 2016-04-05 | 5 | -13/+13 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-05 | 2 | -0/+28 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-04 | 44 | -259/+455 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb | |||||
| * | | | | | | | | | corrected a couple of based on MR review | James Lopez | 2016-04-04 | 1 | -2/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | remove useless var | James Lopez | 2016-04-01 | 1 | -1/+0 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixes after more import testing | James Lopez | 2016-04-01 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix github import issues | James Lopez | 2016-04-01 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix fogbugz import | James Lopez | 2016-04-01 | 2 | -9/+8 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | more fixes after doing more manual testing on importing | James Lopez | 2016-03-29 | 2 | -2/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixing a few issues after testing imports | James Lopez | 2016-03-29 | 3 | -13/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixed failing specs | James Lopez | 2016-03-29 | 1 | -1/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | refactored code based on feedback plus fixed a couple of other issues | James Lopez | 2016-03-28 | 6 | -41/+36 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-03-28 | 5 | -25/+100 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * | | | | | | | | | | added rest of importers, fixed specs and some issues with the migration | James Lopez | 2016-03-23 | 2 | -9/+13 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fogbugz importer, also refactored migration again to make it easier to add ↵ | James Lopez | 2016-03-23 | 2 | -4/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new importers | |||||
| * | | | | | | | | | | fix rubocop warning | James Lopez | 2016-03-22 | 1 | -2/+0 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fix gitlab import and spec | James Lopez | 2016-03-22 | 2 | -5/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | first round of fixes and spec fixes | James Lopez | 2016-03-22 | 4 | -31/+32 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | encrypt credentials in project_creator for bitbucket by default | James Lopez | 2016-03-22 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | update bitbucket importer | James Lopez | 2016-03-22 | 2 | -6/+13 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-03-22 | 6 | -11/+29 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-03-21 | 3 | -1/+97 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb | |||||
| * | | | | | | | | | | | | refactored code based on feedback | James Lopez | 2016-03-21 | 1 | -3/+3 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fixed some rubocop warnings | James Lopez | 2016-03-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fixed few issues with the migration | James Lopez | 2016-03-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | more refactoring | James Lopez | 2016-03-21 | 4 | -19/+25 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | some refactoring based on feedback | James Lopez | 2016-03-21 | 4 | -16/+28 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branches 'fix/project-import_url' and 'master' of ↵ | James Lopez | 2016-03-21 | 42 | -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 feedback | James Lopez | 2016-03-07 | 3 | -13/+8 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fix specs | James Lopez | 2016-03-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | added import url exposer to construct URL withunencrypted credentials | James Lopez | 2016-03-04 | 4 | -5/+23 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | some refactoring in the migration. Also fixed github import issue and ↵ | James Lopez | 2016-03-04 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated spec | |||||
* | | | | | | | | | | | | | | Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' | Robert Speicher | 2016-04-15 | 1 | -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-head | Rémy Coutable | 2016-04-15 | 1 | -13/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | | | | | | | | | | | | Merge branch 'rugged-delete-tag' into 'master' | Rémy Coutable | 2016-04-15 | 1 | -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 rugged | Robert Schilling | 2016-04-15 | 1 | -13/+0 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Remove unused backend methods | Robert Schilling | 2016-04-15 | 1 | -27/+0 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'remove-ci-nginx-config' into 'master' | Robert Speicher | 2016-04-14 | 1 | -29/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated NGINX CI config [ci skip] See merge request !3728 | |||||
| * | | | | | | | | | | | | | | Remove deprecated NGINX CI config | Achilleas Pipinellis | 2016-04-14 | 1 | -29/+0 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'emoji_category_fix' into 'master' | Robert Speicher | 2016-04-14 | 1 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji categories fix Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020 See merge request !3727 | |||||
| * | | | | | | | | | | | | | | | Emoji categories fix | Valery Sizov | 2016-04-14 | 1 | -3/+13 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'auto-fsck' into 'master' | Robert Speicher | 2016-04-14 | 2 | -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-fsck | Jacob Vosmaer | 2016-04-13 | 11 | -13/+136 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck | Jacob Vosmaer | 2016-04-12 | 27 | -48/+408 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Add a 'circuit breaker' for repo checks | Jacob Vosmaer | 2016-04-12 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Rename almost all the things | Jacob Vosmaer | 2016-04-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Rebase repo check MR | Jacob Vosmaer | 2016-04-04 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' | Rémy Coutable | 2016-04-14 | 1 | -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 |