summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Include GonHelper separately and remove created_at in factoryStan Hu2016-04-141-2/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-142-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14370 Move gon function into its own helper
* | | | | | | | | | | | | | | | | Use rake db:reset instead of db:setupYorick Peterse2016-04-141-1/+1
| |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using db:reset ensures existing tables are first dropped. This in turn ensures that we can drop tables regardless of any foreign key constraints. While CE currently doesn't have any foreign keys EE defines the following relation: remote_mirrors.project_id -> projects.id MySQL will complain whenever you try to drop the "projects" table first even when using "DROP TABLE ... CASCADE".
* | | | | | | | | | | | | | | | Merge branch 'simplify-gitlab-url_builder-15202' into 'master' Rémy Coutable2016-04-142-35/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record) ``` $ git grep Gitlab::UrlBuilder app/models/commit.rb: url: Gitlab::UrlBuilder.build(self), app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue) app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request) app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note) lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note) spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note)) spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do ``` Fixes #15202. See merge request !3696
| * | | | | | | | | | | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-132-35/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master' Rémy Coutable2016-04-142-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API issue update and note create back dating Closes #14947 See merge request !3551
| * | | | | | | | | | | | | | | | Allow back dating notes on creationMichael Greene2016-04-131-0/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Allow back dating issues on updateMichael Greene2016-04-131-2/+5
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'redis_config_consistency' into 'master' Valery Sizov2016-04-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
| * | | | | | | | | | | | | | | | Redis configuration consistencyredis_config_consistencyValery Sizov2016-04-131-0/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'redis_improvements' into 'master' Robert Speicher2016-04-131-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up ExclusiveLease See merge request !3695
| * | | | | | | | | | | | | | | | | clean up ExclusiveLeaseredis_improvementsValery Sizov2016-04-131-5/+0
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'api-subscribe-issue-mr' into 'master' Rémy Coutable2016-04-132-0/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Subscribe and unsubscribe from issues and merge requests * Closes #6024 This MR is based on !3611, which must be merged first. See merge request !3615
| * | | | | | | | | | | | | | | | Ensure that issues and merge requests are foundRobert Schilling2016-04-131-4/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make subscription API more RESTfulRobert Schilling2016-04-133-31/+14
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | API: Ability to subscribe and unsubscribe from a merge requestRobert Schilling2016-04-132-2/+38
| | | | | | | | | | | | | | | | |