summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-2/+2
| | | | | | | | Older pipelines can contain jobs without a name, in which case 'nameless' is used right now, so we can properly still handle other actions on these jobs. Fixes gitlab-org/gitlab-ce#33403
* Merge branch 'fix/import-commit-status-issue' into 'master'Douwe Maan2017-06-121-1/+1
|\ | | | | | | | | | | | | Ignore commit status name validation on importing Closes #33490 See merge request !12039
| * ignore name validation on importingfix/import-commit-status-issueJames Lopez2017-06-121-1/+1
| |
* | Improve Job detail view to make it refreshed in real-time instead of reloadingFilipa Lacerda2017-06-121-0/+5
|/
* Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-082-9/+12
| | | | binary afer loading all data
* Merge branch 'dm-blob-file-type' into 'master'Grzegorz Bizon2017-06-082-1/+5
|\ | | | | | | | | Add Blob#file_type convenience method See merge request !11982
| * Add Blob#file_type convenience methoddm-blob-file-typeDouwe Maan2017-06-082-1/+5
| |
* | Merge branch 'dm-empty-blob-viewer-binary' into 'master'Grzegorz Bizon2017-06-082-2/+1
|\ \ | |/ |/| | | | | Empty blob viewer isn’t binary-only See merge request !11979
| * Empty blob viewer isn’t binary-onlydm-empty-blob-viewer-binaryDouwe Maan2017-06-072-2/+1
| |
* | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-083-4/+6
|\ \ | | | | | | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977
| * | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-073-4/+6
| |/
* | Merge branch 'clean-up-project-for-merge-conflicts' into 'master'Rémy Coutable2017-06-081-16/+21
|\ \ | | | | | | | | | | | | Clean up the Project model to reduce conflicts See merge request !11967
| * | Split Project#reset_cache_and_import_attrs upYorick Peterse2017-06-081-1/+5
| | | | | | | | | | | | | | | | | | In EE we don't want to remove import data for mirrors. By moving this logic to a separate method we can simply re-define the method in EE using "prepend" and call "super" whenever necessary.
| * | Re-order some methods in ProjectYorick Peterse2017-06-081-15/+16
| | | | | | | | | | | | This ensures the order of these methods is identical in CE and EE.
* | | Merge branch '12614-fix-long-message' into 'master'Dmitriy Zaporozhets2017-06-081-16/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix long urls in the title of commit Closes #12614 See merge request !10938
| * | Fix long urls in the title of commitAlexander Randa2017-05-121-16/+11
| | |
* | | nil-check Repository::is_ancestor?Kim Carlbäcker2017-06-081-0/+2
| | |
* | | Merge branch 'document-polymorphing-columns' into 'master'Rémy Coutable2017-06-0714-14/+14
|\ \ \ | |_|/ |/| | | | | | | | Document using separate tables instead of polymorphic associations and STI See merge request !11168
| * | Added Cop to blacklist polymorphic associationsYorick Peterse2017-06-0714-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | One should really use a separate table instead of using polymorphic associations. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11168 for more information.
* | | 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
| | |_|_|_|/ / / | |/| | | | | |
View Lorry Controller Status