summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Collapse)AuthorAgeFilesLines
* Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-2/+0
|
* 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
| | * | Pending delete projects should not show in deploy keys35338-deploy-keys-should-not-show-pending-delete-projectsTiago Botelho2017-07-251-1/+1
| | |/
| * | Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-projectGrzegorz Bizon2017-07-211-1/+2
| | |
| * | Fix job merge request link to a forked source projectGrzegorz Bizon2017-07-191-1/+1
| |/
* | Used new tree and blob entity path helpersLuke "Jared" Bennett2017-07-202-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2013-88/+36
|\ \ | |/
| * Make commits behind text a link to the target branch commits pageClement Ho2017-07-111-0/+4
| |
| * Convert target branch link to use treeClement Ho2017-07-111-2/+2
| |
| * Fix dashboard labels dropdownNick Thomas2017-07-071-1/+2
| |
| * Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-0512-87/+30
| |
* | Expose last_commit information for tree and blob when serializedDmitriy Zaporozhets2017-06-222-0/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge remote-tracking branch 'origin/master' into dm-tree-jsonDmitriy Zaporozhets2017-06-2220-37/+230
|\ \ | |/
| * Improve method names and add more specsFelipe Artur2017-06-161-1/+0
| |
| * Expose correct path to groupAlfredo Sumaran2017-06-161-1/+5
| |
| * Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-145-12/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (34 commits) Revert "Merge branch 'karma-headless-chrome' into 'master'" Make small pipeline schedules UI enhancements. Remove js classes from vue component that are not needed in vue component Update tests and application Adds "Pipeline" to job's sidebar Change border color of job's scroll controllers to $border-color Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Added Tectonic to the page. Always check read_issue permissions when loading issue Handle legacy jobs without name Do not expose internal artifacts hash in build entity Use wait_for_requests instead of sleep 0.3 Limit wiki container width Fix migrations testing support RSpec hooks order Rename BuildEntity to JobEntity Fix support for external_url for commit statuses Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them add CHANGELOG.md entry for !12036 remove phantomjs-specific test hacks update karma job to use chrome build image created by gitlab-build-images!41 ...
| | * Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-145-7/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
| | | * Rename BuildEntity to JobEntityKamil Trzcinski2017-06-135-7/+7
| | | |
| | | * Fix support for external_url for commit statusesKamil Trzcinski2017-06-131-1/+1
| | | |
| | * | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposureGrzegorz Bizon2017-06-131-5/+2
| | |/
| * | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-137-9/+92
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (460 commits) Center dropdown for pipeline's mini graph Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions Fix filename method of GitlabUploader to return always real filename Ignore CVE-2017-5029 in Nokogiri Refactor atom builder by using xml.atom layout Let PhantomJS load local images Add a changelog entry Only add a description change note when no tasks are updated Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1) Use gitaly 0.11.2 Add the ability to perform background migrations Always render warnings icon in orange Fix a few translation for zh_TW Improve Job detail view to make it refreshed in real-time instead of reloading Attempts to run RSpec tests twice (1 retry) ignore name validation on importing Only show hover state on links and buttons Use vue files for navigation tabs and buttons doc: add example of scheduler when Add test for u2f helper and changelog entry ...
| | * Improve Job detail view to make it refreshed in real-time instead of reloadingFilipa Lacerda2017-06-122-5/+15
| | |
| | * Expose human group access on GroupEntityDouwe Maan2017-06-071-2/+2
| | |