summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | API: Ability to subscribe and unsubscribe from an issueRobert Schilling2016-04-132-0/+57
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'api-star-project' into 'master' Rémy Coutable2016-04-132-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Star and unstar a project Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project. * Closes #12739 See merge request !3578
| * | | | | | | | | | | | | | | | Styling changes to code and docsRobert Schilling2016-04-132-2/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make staring API more restfulRobert Schilling2016-04-131-6/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | API: Star and unstar a projectRobert Schilling2016-04-132-0/+37
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-131-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
| * | | | | | | | | | | | | | | | Better control flow.external-omniauth-providersPatricio Cano2016-04-111-6/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Allow `external_providers` for Omniauth to be defined to mark these users as ↵Patricio Cano2016-04-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external
* | | | | | | | | | | | | | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
| * | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-1/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15105
* | | | | | | | | | | | | | | | | Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets2016-04-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Gitlab.com?` method To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com. See merge request !3682
| * | | | | | | | | | | | | | | | | Add `Gitlab.com?` methodrs-gitlab-com-checkRobert Speicher2016-04-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com.
* | | | | | | | | | | | | | | | | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-131-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Return 404 if user does not have access to group Closes #15185 After !3587 is merged, I'll update this one to also fix the return code of the tests in !3587. See merge request !3683
| * | | | | | | | | | | | | | | | | API: Return 404 if user does not have access to groupRobert Schilling2016-04-131-2/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'api-move-issues' into 'master' Rémy Coutable2016-04-131-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
| * | | | | | | | | | | | | | | | | Update tests for moving issues via APIRobert Schilling2016-04-131-7/+7
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | API: Ability to move an issueRobert Schilling2016-04-131-0/+23
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Added ability to add custom tags to transactionsYorick Peterse2016-04-131-0/+10
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One use case for this is manually setting the "action" tag for Grape API calls. Due to Grape running blocks there are no human readable method names that can be used for the "action" tag, thus we have to set these manually on a case by case basis.