summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-073-4/+6
|
* Merge branch 'reenable-gitaly-commit-raw-diffs' into 'master'Robert Speicher2017-06-071-6/+5
|\ | | | | | | | | Re-enable Gitaly commit_raw_diffs migration See merge request !11970
| * Re-enable Gitaly commit_raw_diffs migrationAhmad Sherif2017-06-071-6/+5
| |
* | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-072-1/+5
|\ \ | |/ |/| | | | | | | | | Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820
| * Expand/collapse close & backlog lists in issue boardsPhil Hughes2017-05-312-1/+5
| | | | | | | | | | | | | | | | | | The closed & backlog lists in issue boards are no collapsible. They can be collapsed independently of each other & this selection is then saved to the browser through localStorage. When the page loads, the code gets the data from localStorage & determines whether to show or hide the list Closes #23917
* | Merge branch 'issue_27166_2' into 'master'Douwe Maan2017-06-071-2/+2
|\ \ | | | | | | | | | | | | Avoid repeated queries for pipeline builds on merge requests See merge request !11888
| * | Avoid repeated queries for pipeline builds on merge requestsissue_27166_2Felipe Artur2017-06-061-2/+2
| | |
* | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-074-76/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Persist stages in the database Closes #26481 See merge request !11790
| * \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-0614-46/+106
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: (76 commits) redesign caching of application settings Fix binary encoding error on MR diffs Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Actually clean gitlab-test path when TestEnv.set_repo_refs fails Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Resolve "When changing project visibility setting, change other dropdowns automatically" Update explanation of job-level variable override to fit example change headings to improve SEO backports changed import logic from pull mirroring feature into CE ...
| * \ \ \ Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0580-479/+522
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (524 commits) Improve user experience around slash commands in instant comments Fix LFS timeouts when trying to save large files retryable? is now available for CommitStatus Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" Fix test failures Add slugify project path to CI enviroment variables Fixed typo: craeted -> created 32118 Make New environment empty state btn lowercase Expose import_status in Projects API 32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon Fix test failures Allow manual bypass of auto_sign_in_with_provider Fix keys seed Allow users to be hard-deleted from the API fixup some classnames and media queries Enable the Style/PreferredHashMethods cop Lint our factories creation in addition to their build Don’t schedule workers from inside transactions Allow scheduling from after_commit hooks Forbid Sidekiq scheduling in transactions ... Conflicts: app/serializers/pipeline_entity.rb db/schema.rb spec/factories/ci/stages.rb spec/lib/gitlab/import_export/safe_model_attributes.yml spec/services/ci/create_pipeline_service_spec.rb spec/spec_helper.rb
| * | | | | Remove legacy method from pipeline classGrzegorz Bizon2017-06-051-11/+0
| | | | | |
| * | | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-023-13/+21
| | | | | |
| * | | | | Rename `Ci::Stage` class to `Ci::LegacyStage`Grzegorz Bizon2017-06-012-3/+3
| | | | | |
| * | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-9/+9
| | | | | |
| * | | | | Expose pipeline stage seeds from pipeline instanceGrzegorz Bizon2017-05-311-5/+7
| | | | | |
| * | | | | Return stage seeds object from YAML processorGrzegorz Bizon2017-05-311-3/+5
| | | | | |
| * | | | | Remove legacy method from create build serviceGrzegorz Bizon2017-05-301-0/+3
| | | | | |
| * | | | | Expose stage model attributes from pipeline objectGrzegorz Bizon2017-05-301-0/+10
| | | | | |
* | | | | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-071-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| * | | | | | Support descriptions for snippetsJarka Kadlecova2017-05-311-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'zj-read-registry-pat' into 'master'Kamil Trzciński2017-06-071-6/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow pulling container images using personal access tokens Closes #19219 See merge request !11845
| * | | | | | Create read_registry scope with JWT authZ.J. van de Weg2017-06-051-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first commit doing mainly 3 things: 1. create a new scope and allow users to use it 2. Have the JWTController respond correctly on this 3. Updates documentation to suggest usage of PATs There is one gotcha, there will be no support for impersonation tokens, as this seems not needed. Fixes gitlab-org/gitlab-ce#19219
* | | | | | | Merge branch '2563-backport-ee1942' into 'master'Grzegorz Bizon2017-06-071-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport some EE changes from adding shared_runners_minutes_limit to the API Closes gitlab-ee#2563 See merge request !11936
| * | | | | | Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942Lin Jen-Shin2017-06-061-1/+1
| | | | | | |
* | | | | | | redesign caching of application settingsPaul Charlton2017-06-061-2/+3
| | | | | | |
* | | | | | | Merge branch '29271-fix-pages-numeric-domain' into 'master'Grzegorz Bizon2017-06-061-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow numeric pages domain Closes #29271 See merge request !11927
| * | | | | | | Allow numeric pages domainDrew Blessing2017-06-061-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, `PagesDomain` would not allow a domain such as 123.example.com. With this change, this is now allowed, because it is a perfectly valid domain.
* | | | | | | Introduce an Events APIMark Fletcher2017-06-061-0/+32
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Meld the following disparate endpoints: * `/projects/:id/events` * `/events` * `/users/:id/events` + Add result filtering to the above endpoints: * action * target_type * before and after dates
* | | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-052-9/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | backports changed import logic from pull mirroring feature into CE See merge request !11850
| * | | | | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-052-9/+26
| | | | | | |
* | | | | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-053-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be hard-deleted from the admin panel Closes #28694 See merge request !11874
| * | | | | | | Refactor the DeleteUserWorkerNick Thomas2017-06-053-4/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-053-21/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE refactorings for Protected Tag EE-only functionality See merge request !11125
| * | | | | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-313-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements and refactorings were made while adding role based permissions for protected tags to EE. This doesn’t backport the feature, but should improve code quality and minimize divergence.
* | | | | | | | Merge branch '33154-permissions-for-project-labels-and-group-labels' into ↵Douwe Maan2017-06-054-8/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Permissions for project labels and group labels" Closes #33154 See merge request !11876
| * | | | | | | Allow group reporters to manage group labels33154-permissions-for-project-labels-and-group-labelsSean McGivern2017-06-054-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only group masters could do this. However, project reporters can manage project labels, so there doesn't seem to be any need to restrict group labels further. Also, save a query or two by getting a single GroupMember object to find out if the user is a master or not.
* | | | | | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-054-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-0255-189/+213
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| * | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-314-0/+10
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-051-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add slugified project path to CI environment variables Closes #31061 See merge request !11838
| * | | | | | | | | Add slugify project path to CI enviroment variablesvanadium232017-06-031-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-052-9/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial implementation for real time job view Closes #31397 See merge request !11651
| * | | | | | | | | retryable? is now available for CommitStatuszj-job-view-goes-real-timeZ.J. van de Weg2017-06-041-1/+6
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-0253-170/+191
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-012-9/+11
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Incorporate reviewZ.J. van de Weg2017-05-311-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Create PipelineDetailsEntityZ.J. van de Weg2017-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have a PipelineEntity which is a bit smaller, mostly in bytes needing to send to the frontend. PipelineDetailsEntity is the default for the PipelineSerializer, limiting the changes needed. This commit also incorporates the review.
| * | | | | | | | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-311-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
* | | | | | | | | | | Merge branch 'sidekiq-transaction' into 'master'Sean McGivern2017-06-056-14/+24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid Sidekiq scheduling in transactions Closes #27233 See merge request !9376
| * | | | | | | | | | | Don’t schedule workers from inside transactionsDouwe Maan2017-06-026-14/+24
| | |_|/ / / / / / / / | |/| | | | | | | | |
View Lorry Controller Status