summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Prevent user from changing username with container registry tagsMichael Kozono2017-08-091-0/+8
|
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-092-11/+11
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-091-1/+1
|
* Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0810-19/+20
|\ | | | | | | | | Add rubocop-gitlab-security gem See merge request !12177
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0810-19/+20
| |
* | Merge branch ↵Rémy Coutable2017-08-081-7/+12
|\ \ | |/ |/| | | | | | | | | | | | | '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one' into 'master' Resolve "API v4 allows setting a branch that doesn't exist as the default one" Closes #36010 See merge request !13359
| * Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-081-7/+12
| |
* | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-083-17/+8
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
| * | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-1/+1
| | |
| * | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-071-12/+2
| | | | | | | | | | | | | | | | | | This helps keep the abstraction layers simpler, and also keep the interface of those methods consistent, in case of implementation changes.
| * | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-073-4/+5
| | |
* | | Merge branch 'master' into ideMike Greiling2017-08-077-37/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * \ \ Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-16/+7
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| | * | Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-071-0/+1
| | | |
| | * | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-16/+6
| | | |
| * | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-11/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268
| | * | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-11/+28
| | |/ / | | | | | | | | | | | | Closes gitaly#443
| * | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Issuables: Move some code from create services to Sidekiq workers See merge request !13326
| | * | | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-071-0/+1
| | | | |
| * | | | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-071-3/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store & use ConvDev percentages returned by Version app Closes #35761 See merge request !13217
| | * | | | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-071-3/+1
| | | | | |
| * | | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-072-4/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE Closes #21391 See merge request !13275
| | * | | | Backport changes in ↵Nick Thomas2017-08-072-4/+3
| | | |_|/ | | |/| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
| * | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| | * \ \ \ Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0734-313/+711
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| | * | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
| | * | | | | Allow projects to be started from a templateZ.J. van de Weg2017-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started implementation for the first iteration of gitlab-org/gitlab-ce#32420. This will allow users to select a template to start with, instead of an empty repository in the project just created. Internally this is basically a small extension of the ImportExport GitLab projects we already support. We just import a certain import tar archive. This commits includes the first one: Ruby on Rails. In the future more will be added.
| * | | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-071-3/+9
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289
| | * | | | | Support references to group milestonesSean McGivern2017-08-071-3/+9
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
* | | | | | Merge branch 'master' into ideMike Greiling2017-08-0710-74/+264
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * | | | | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-072-37/+45
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add feature rename wiki title Closes #27800 See merge request !10069
| | * | | | | Allow wiki pages to be renamed in the UIwendy04022017-08-032-37/+45
| | | | | | |
| * | | | | | Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-071-11/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve various parts of Dashboard::ProjectsController See merge request !13319
| | * | | | | | Memoize a user's personal projects countYorick Peterse2017-08-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method User#projects_limit_left would run "personal_projects.count" but such a query is not memoized. As a result multiple calls to User#projects_limit_left would result in multiple COUNT(*) queries being executed. To work around this this commit adds User#personal_projects_count which simply memoizes the result of the COUNT(*) in an instance variable.
| | * | | | | | Remove redundant query from User#recent_pushYorick Peterse2017-08-071-10/+8
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "events" table has a foreign key on "events.project_id" with a cascading delete. As such it's impossible for an event to have a non-existing project ID.
| * | | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-072-6/+30
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
| | * | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-071-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Gitaly deletions and annotations See merge request !13280
| | | * | | | Rename raw -> ruggedJacob Vosmaer2017-08-041-1/+1
| | | |/ / /
| | * | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'Robert Speicher2017-08-041-5/+29
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#last_commit_for_path to Gitaly Closes gitaly#433 See merge request !13200
| | | * | | | Migrate Repository#last_commit_for_path to GitalyAhmad Sherif2017-08-031-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#433
| * | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-041-13/+28
| |/ / / / /
| * | | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-041-0/+125
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor.notification recipient builders See merge request !13197
| | * | | | | move the read_ability logic into NotificationRecipienthttp://jneen.net/2017-08-031-4/+18
| | | | | | |
| | * | | | | use the accessor for `type`http://jneen.net/2017-08-031-1/+1
| | | | | | |
| | * | | | | fix commenthttp://jneen.net/2017-08-031-1/+2
| | | | | | |
| | * | | | | use safe navigation on notification_settinghttp://jneen.net/2017-08-031-1/+1
| | | | | | |
| | * | | | | short-circuit if there is no policy, and add :read_project checkhttp://jneen.net/2017-08-031-3/+6
| | | | | | |
| | * | | | | style fixeshttp://jneen.net/2017-08-031-7/+8
| | | | | | |
| | * | | | | don't require projecthttp://jneen.net/2017-08-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not there in the case of personal snippets, f. ex., and we've already guarded against its being missing in #find_notification_setting
| | * | | | | default the project to target.projecthttp://jneen.net/2017-08-031-3/+9
| | | | | | |
View Lorry Controller Status