summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-081-1/+1
|\ | | | | | | | | | | | | Bypass signup domain validation for external users Closes #25279 See merge request !8575
| * Bypass signup domain validation for external usersReza Mohammadi2017-02-081-1/+1
| | | | | | | | Fixes #25279
* | Merge branch 'mr-widget-pipelines' into 'master' Fatih Acet2017-02-081-0/+6
|\ \ | | | | | | | | | | | | Reduce padding of mr widget mini graph See merge request !9071
| * | Reduce padding of mr widget mini graphAnnabel Dunstone Gray2017-02-081-0/+6
| | |
* | | Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-083-5/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010
| * | | Add tests27756-fix-json-404-responseAlfredo Sumaran2017-02-071-1/+1
| | | |
| * | | Fixes ajax requests when current URL has a trailing slashAlfredo Sumaran2017-02-073-5/+6
| | | |
* | | | Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' Clement Ho2017-02-081-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks for correct key to pass to commit prop. Adds rspec test. Closes #27880 See merge request !9070
| * | | | Looks for correct key to pass to commit prop. Adds rspec test.Filipa Lacerda2017-02-081-3/+3
| | | | |
* | | | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-089-64/+104
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Store group and project full name and full path in routes table See merge request !8979
| * | | | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-089-64/+104
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-0811-67/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix inconsistent naming for services that delete things See merge request !5803
| * | | | Fix inconsistent naming for services that delete thingsdixpac2017-02-0811-67/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed name of delete_user_service and worker to destroy * Move and change delete_group_service to Groups::DestroyService * Rename Notes::DeleteService to Notes::DestroyService
* | | | | Merge branch 'minigraph-fix' into 'master' Filipa Lacerda2017-02-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Listens on document for mini-pipeline graph See merge request !9066
| * | | | Listens on document for mini-pipeline graphminigraph-fixPhil Hughes2017-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | This technically fixes an issue in EE, but to keep code the same this is the CE port
* | | | | Merge branch 'backport-ee-build-fixes' into 'master' Filipa Lacerda2017-02-082-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport fixes for pipelines_store frontend specs Closes #27871 See merge request !9067
| * | | | | backport fixes for pipelines_store frontend specsbackport-ee-build-fixesMike Greiling2017-02-082-1/+12
| | | | | |
* | | | | | Merge branch '20495-plus-icon-button' into 'master' Alfredo Sumaran2017-02-082-6/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove plus icon from compare view Closes #20495 See merge request !9056
| * | | | | Remove plus icon in commits view MR buttonAnnabel Dunstone Gray2017-02-081-3/+1
| | | | | |
| * | | | | Remove plus icon from compare viewAnnabel Dunstone Gray2017-02-071-3/+1
| | | | | |
* | | | | | Merge branch 'dz-limit-nested-groups' into 'master' Douwe Maan2017-02-081-1/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Limit level of nesting for groups See merge request !9000
| * | | | | Limit level of nesting for groupsdz-limit-nested-groupsDmitriy Zaporozhets2017-02-081-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch '26705-filter-todos-by-manual-add' into 'master'Sean McGivern2017-02-081-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter todos by manual add Closes #26705 See merge request !8861
| * | | | | | Filter todos by manual addJacopo2017-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the option to filter todo by Added and Pipelines
* | | | | | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-083-29/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose paginated environments list API endpoint See merge request !8928
| * | | | | | | 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-07107-452/+2167
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-061-3/+4
| | | | | | | |
| * | | | | | | Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-063-25/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into feature/gb/paginated-environments-apiGrzegorz Bizon2017-02-06269-992/+2464
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-031-1/+1
| | | | | | | | |
| * | | | | | | | 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-082-9/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-311-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #cache_merge_request_closes_issues! and #issues_mentioned_but_not_closing
| * | | | | | | | | 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-082-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07341-1393/+4565
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed-unused-parameter-status-only
| * | | | | | | | | | | Removed unused parameter `status_only: true`.Dinesh Sawant2017-02-072-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes Issue #25607 Added changelog.
* | | | | | | | | | | | Merge branch 'lfs-noauth-public-repo' into 'master'Rémy Coutable2017-02-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lfs: do not require auth for public repositories Closes #23360 See merge request !8824
| * | | | | | | | | | | lfs: do not require auth for public repositoriesBen Boeckel2017-02-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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-081-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add default labels to bulk assign dropdowns Closes #27822 See merge request !9042
| * | | | | | | | | | | 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-081-11/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dismiss sidebar on action button click Closes #27227 See merge request !8798