summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Kamil Trzciński2017-10-062-0/+13
|\ | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470
| * Merge branch 'master' into ↵Shinya Maeda2017-10-071-2/+6
| |\ | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ Merge branch 'master' into ↵Shinya Maeda2017-10-061-0/+1
| |\ \ | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-10-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-055-2/+68
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | Remove status enum from Gcp::Cluster, use state_machine#stateKamil Trzcinski2017-10-041-1/+1
| | | | | |
| * | | | | Introduce serializer for ClusterEntityKamil Trzcinski2017-10-032-0/+13
| | | | | |
* | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| * | | | | Disable comment form when discussion locked for userJarka Kadlecova2017-09-261-1/+1
| | | | | |
| * | | | | Expose discussion_locked for issue_entityLuke "Jared" Bennett2017-09-141-0/+1
| | | | | |
* | | | | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'Grzegorz Bizon2017-10-061-2/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move to CE some EE pipelines-related code that belongs to CE Closes gitlab-ee#3616 See merge request gitlab-org/gitlab-ce!14699
| * | | | | Expose failure reason in pipeline error badgeGrzegorz Bizon2017-10-051-2/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: app/serializers/pipeline_entity.rb
* | | | | Merge branch '38389-allow-merge-without-success' into 'master'Fatih Acet2017-10-051-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Allow merge when no pipeline success Closes #38389 See merge request gitlab-org/gitlab-ce!14633
| * | | | Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-051-0/+1
| |/ / / | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
* | | | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-051-1/+1
|/ / /
* | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-044-0/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Lazy load and paginate registry image list Closes #31050 See merge request gitlab-org/gitlab-ce!14303
| * | | Add ContainerTag and ContainerRepository frontend APIKamil Trzcinski2017-09-214-0/+68
| |/ /
* | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-2/+0
|\ \ \ | |_|/ |/| | | | | | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!14285
| * | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-2/+0
| |/
* | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-0/+1
| |
* | Port fast-forward MR widget states from EEEric Eastwood2017-09-191-1/+0
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076
* | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+5
|/
* Implemented the new Description ContentTim Zallmann2017-09-121-1/+1
|
* Fixed the URL + renamed to Job FailedTim Zallmann2017-09-121-2/+2
|
* Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-072-3/+7
| | | | | Do not use `location.pathname` when accessing environments folders See merge request !2147
* Use hook for setting Pipeline config_sourceZeger-Jan van de Weg2017-09-061-1/+1
|
* Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0410-2/+111
|\
| * Fix specsDouwe Maan2017-08-301-2/+2
| |
| * Misc tweaksDouwe Maan2017-08-173-11/+5
| |
| * Return null attachment when there is noneDouwe Maan2017-08-171-1/+1
| |
| * Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-172-2/+15
| |\ | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
| * | Use UserNoteEntity instead of UserEntity for notesJarka Kadlecova2017-08-113-4/+11
| | |
| * | Fix failing static-analysis (rubocop)Jarka Kadlecova2017-08-112-4/+4
| | |
| * | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-103-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (42 commits) alternative route for download archive Add missing command to compile GetText files Prevent user from changing username with container registry tags Rename RPC 'Exists' to 'RepositoryExists' Fix the sticky changes bar on commits page Fix ee_compat_check when EE branch uses a prefix Removed display styles when hiding the fly out navigation Explain why we use select all for project_url_constrainer.rb Fix pikaday being undefined Add a helper to stub storage settings with defaults Enable the Layout/SpaceBeforeBlockBraces cop update Install from Source instructions Translations can be picked without asking for exceptions Ask for exceptions in advance Don't require stackprof in Gemfile Synchronous Korean translation in zanata Use full path of user's avatar in webhooks Update icon color on hover Align all nav items in sidebar Fix height of collapsed sidebar items ...
| * \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-086-1/+69
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (481 commits) Make sure that we have author and committer disable file upload button while uploading Fix bar chart does not display label at hour 0 Fixed activity not loading on project homepage Expose noteable_iid in Note Fix fly-out width when it has long items Add a test to show that threshold 40 would corrupt Add changelog entry Raise encoding confidence threshold to 50 Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/` Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/` Add Italian translations of Pipeline Schedules Restrict InlineJavaScript for haml_lint to dev and test environment Incorporate Gitaly's CommitService.FindCommit RPC Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit fix repo_edit_button_spec.js fix test failures in repo_preview_spec.js fix repo_loading_file_spec tests Refactor Gitlab::Git::Commit to include a repository use 100vh instead of flip flopping between the two - works on all suported browsers ...
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-312-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/concerns/notes_actions.rb # spec/features/task_lists_spec.rb # spec/support/features/issuable_slash_commands_shared_examples.rb
| * | | | | Remove noteable ID and type from IssueEntity create_note_pathDouwe Maan2017-07-211-1/+1
| | | | | |
| * | | | | Fix IssueEntity create_note_pathDouwe Maan2017-07-211-1/+1
| | | | | |
| * | | | | Remove duplicate attributes from discussion entity and move note.can_edit ↵Douwe Maan2017-07-212-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | into note.current_user
| * | | | | Add data required for note formDouwe Maan2017-07-213-2/+23
| | | | | |
| * | | | | Add full JSON endpoints for issue notes and discussionsDouwe Maan2017-07-217-0/+95
| | | | | |
* | | | | | Add config_source to ci_pipelinesZeger-Jan van de Weg2017-08-311-0/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the user can soon have multiple config sources for CI, we now store what type at the time of the pipeline run we chose. This will give us insight into what triggered the new pipeline so we can display it to the enduser.
* | | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
| * | | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-152-2/+2
| | |_|_|/ | |/| | |
* | | | | Many Repo FixesJacob Schatz2017-08-151-1/+14
|/ / / /
* | | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-083-3/+3
| |_|/ |/| |
* | | Merge branch 'master' into ideMike Greiling2017-08-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-282-2/+3
|\ \ \ | |/ /
| * | Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' ↵Sean McGivern2017-07-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Pending delete projects should now show in deploy keys Closes #35338 See merge request !13088