summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Uses shared vue resource interceptordiff-notes-refactorPhil Hughes2017-02-091-7/+1
|
* Refactored diff notes Vue appPhil Hughes2017-02-0811-67/+58
| | | | It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
* Merge branch 'pages-0.3.0' into 'master' Robert Speicher2017-02-081-1/+1
|\ | | | | | | | | Update GitLab pages to v0.3.0 See merge request !9043
| * Update GitLab pages to v0.3.0Nick Thomas2017-02-071-1/+1
| |
* | Merge branch '26705-filter-todos-by-manual-add' into 'master'Sean McGivern2017-02-084-8/+61
|\ \ | | | | | | | | | | | | | | | | | | Filter todos by manual add Closes #26705 See merge request !8861
| * | Filter todos by manual addJacopo2017-01-284-8/+61
| | | | | | | | | | | | Added the option to filter todo by Added and Pipelines
* | | Merge branch 'patch-10' into 'master'Rémy Coutable2017-02-081-17/+18
|\ \ \ | | | | | | | | | | | | | | | | Show how to reference a line within a repository file. See merge request !8249
| * | | Shows how to reference a line within a repository file.Marcel Huber2016-12-221-17/+18
| | | |
* | | | Merge branch 'fix-api-delete-file-example' into 'master'Rémy Coutable2017-02-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix the curl command for deleting files (DELETE instead of PUT) See merge request !8245
| * | | | Fix the curl command for deleting files (DELETE instead of PUT)Bruno Melli2016-12-211-1/+1
| | | | |
* | | | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-089-34/+282
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose paginated environments list API endpoint See merge request !8928
| * | | | | Make headers asserts explicit in pagination specsfeature/gb/paginated-environments-apiGrzegorz Bizon2017-02-071-5/+8
| | | | | |
| * | | | | Use `#present?` instead of `defined?` in serializersGrzegorz Bizon2017-02-072-2/+2
| | | | | |
| * | | | | Simplify implementation of environments serializerGrzegorz Bizon2017-02-071-5/+4
| | | | | |
| * | | | | Merge branch 'master' into feature/gb/paginated-environments-apiFilipa Lacerda2017-02-07305-1117/+10648
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (301 commits) added missed commit in rebase update Grape routes to work with current version of Grape adds changelog fixes cursor issue on pipeline pagination Use random group name to prevent conflicts List all groups/projects for admins on explore pages Fix indentation More backport Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Fixed variables_controller_spec.rb test Backport of the frontend view, including tests Updated the #create action to render the show view in case of a form error Improved code styling on the variables_controller_spec Added tests for the variables controller #update action Added a variable_controller_spec test to test for flash messages on the #create action Modified redirection logic in the variables cont. Added redirections to the index actions for the variables and triggers controllers Added a flash message to the creation of triggers Fixed tests, renamed files and methods Changed the controller/route name to 'ci/cd' and renamed the corresponding files ...
| * | | | | | Add specs for standalone pagination for serializersGrzegorz Bizon2017-02-064-5/+61
| | | | | | |
| * | | | | | Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-064-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to avoid conflicts with `Paginator` class that seems to be used by some bundled libs.
| * | | | | | Rename `Gitlab::Serialize` module to reuse it laterGrzegorz Bizon2017-02-063-3/+3
| | | | | | |
| * | | | | | Merge branch 'master' into feature/gb/paginated-environments-apiGrzegorz Bizon2017-02-06629-4590/+9482
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (295 commits) Add index to labels for `type` and project_id` fix rack-proxy dependency in production Fixed typo fix failing test fix Vue warnings for missing element UX Guide: Button placement in groups Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed eslint test failure Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values ...
| * | | | | | | Extend environments folders and pagination API specsGrzegorz Bizon2017-02-032-1/+84
| | | | | | | |
| * | | | | | | Fix typo in pipeline serializer specsGrzegorz Bizon2017-02-031-1/+1
| | | | | | | |
| * | | | | | | Add specs for environments serializer paginationGrzegorz Bizon2017-02-031-0/+49
| | | | | | | |
| * | | | | | | Order environments twice in environments serializerGrzegorz Bizon2017-02-031-0/+1
| | | | | | | |
| * | | | | | | Encapsulate reused pagination component in a classGrzegorz Bizon2017-02-023-28/+42
| | | | | | | |
| * | | | | | | Use serializer to group environments into foldersGrzegorz Bizon2017-02-021-0/+39
| | | | | | | |
* | | | | | | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-085-12/+94
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass in current_user in MergeRequest and MergeRequestsHelper See merge request !8624
| * | | | | | | | Remove MergeRequest#closes_issue?; Remove the default parameter value for ↵Dongqing Hu2017-01-312-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #cache_merge_request_closes_issues! and #issues_mentioned_but_not_closing
| * | | | | | | | tests for #mr_closes_issues and #mr_issues_mentioned_but_not_closing in ↵Dongqing Hu2017-01-252-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequestsHelper
| * | | | | | | | should pass in current_user from MergeRequestsHelperDongqing Hu2017-01-191-2/+2
| | | | | | | | |
| * | | | | | | | use the current_user parameter in MergeRequest#issues_mentioned_but_not_closingDongqing Hu2017-01-181-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'removed-unused-parameter-status-only' into 'master'Rémy Coutable2017-02-083-6/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused parameter status only Closes #25607 See merge request !9035
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/dinsaw/gitlab-ce into ↵Dinesh Sawant2017-02-07886-5854/+20700
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed-unused-parameter-status-only
| * | | | | | | | | | Removed unused parameter `status_only: true`.Dinesh Sawant2017-02-073-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes Issue #25607 Added changelog.
* | | | | | | | | | | Merge branch 'lfs-noauth-public-repo' into 'master'Rémy Coutable2017-02-083-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lfs: do not require auth for public repositories Closes #23360 See merge request !8824
| * | | | | | | | | | | lfs: do not require auth for public repositoriesBen Boeckel2017-02-073-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LFS has the `authenticated` field in the response for downloads of objects to indicate that the object does not need authentication to access it. Spec: https://github.com/git-lfs/git-lfs/blob/master/docs/api/batch.md#successful-responses Fixes #23360.
* | | | | | | | | | | | Merge branch 'jej-lint-scripts-and-config' into 'master'dz-nested-groups-docsDouwe Maan2017-02-083-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax linting for init scripts Closes #27787 See merge request !9054
| * | | | | | | | | | | | CI runs lint on shell scripts in lib/supportjej-lint-scripts-and-configJames Edwards-Jones2017-02-073-0/+53
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-pipelines-store-test' into 'master' Alfredo Sumaran2017-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace arrow function with regular function to prevent overiding function context See merge request !9057
| * | | | | | | | | | | | | Replace arrow function with regular function to prevent overiding function ↵Clement Ho2017-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | context
* | | | | | | | | | | | | | Merge branch '27822-default-bulk-assign-labels' into 'master' Alfredo Sumaran2017-02-082-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add default labels to bulk assign dropdowns Closes #27822 See merge request !9042
| * | | | | | | | | | | | | Add changelog27822-default-bulk-assign-labelsAnnabel Dunstone Gray2017-02-071-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add default labels to bulk assign dropdownsAnnabel Dunstone Gray2017-02-071-4/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'no-sidebar-on-action-btn-click' into 'master' Clement Ho2017-02-084-11/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dismiss sidebar on action button click Closes #27227 See merge request !8798
| * | | | | | | | | | | | | | dismiss sidebar on repo buttons clickAdam Pahlevi2017-02-084-11/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the selector more inclusive spec for dashboard’s sidebar visibility fix linting errors for project dashboard page remove unused var: shouldBeCollapsed use project with repo, so download button became available use es6 style for testing project dashboard un-aliased global reference at sidebar.js.es6 fix spec from linting errors code improvement add singleton to `this` assign `singleton` to class add space in between remove `no-underscore-dangle` add complete changelog sidebar internal state test remove on page change, not exist in master. rebase. only nicescroll if the element is there new require style reference to sidebar content outside of timeout
* | | | | | | | | | | | | | | Merge branch '25134-mobile-issue-view-doesn-t-show-organization-membership' ↵Annabel Dunstone Gray2017-02-072-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Show organisation membership and delete comment action on smaller viewports, plus chang… Closes #25134 See merge request !8905
| * | | | | | | | | | | | | | Fix static class error25134-mobile-issue-view-doesn-t-show-organization-membershipAnnabel Dunstone Gray2017-02-071-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Show organisation membership and delete comment on smaller viewports, plus ↵dimitrieh2017-02-062-4/+11
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change comment author name to username
* | | | | | | | | | | | | | Merge branch 'fix-ignored-spec-failures' into 'master' Filipa Lacerda2017-02-071-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure karma fails if it cannot load all spec files See merge request !9038
| * | | | | | | | | | | | | | ensure karma fails if it cannot load all spec filesfix-ignored-spec-failuresMike Greiling2017-02-071-2/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'revert-135b4f75' into 'master' Douwe Maan2017-02-072-10/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-karma-coverage' into 'master'" See merge request !9051