Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Blob#load_all_data! doesn’t need an argumentblob-load-all-data | Douwe Maan | 2017-06-07 | 1 | -1/+1 |
| | |||||
* | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-cop | Rémy Coutable | 2017-06-02 | 2 | -2/+2 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'migrate-old-artifacts' into 'master' | Grzegorz Bizon | 2017-06-01 | 1 | -10/+0 |
|\ | | | | | | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently used path Closes #32036 See merge request !11824 | ||||
| * | Add missing specs | Kamil Trzcinski | 2017-06-01 | 1 | -10/+0 |
| | | |||||
| * | Fix data inconsistency issue for old artifacts by moving them to a currently ↵ | Kamil Trzcinski | 2017-06-01 | 1 | -1/+1 |
| | | | | | | | | used path | ||||
* | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master' | Rémy Coutable | 2017-06-01 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | Add missing `can_push` parameter to POST /v3/deploy_keys See merge request !11607 | ||||
| * | Add missing `can_push` parameter to POST /v3/deploy_keys | Richard Clamp | 2017-05-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The v3 API documentation claims that `can_push` is supported when adding a deploy_key. https://gitlab.com/gitlab-org/gitlab-ce/blob/8-16-stable/doc/api/deploy_keys.md#add-deploy-key Here we make good on this promise by adding `can_push` as an optional parameter so grape can route it. This was copied from the v4 API. | ||||
* | | Merge branch 'dm-collapsed-blob' into 'master' | Sean McGivern | 2017-06-01 | 2 | -2/+2 |
|\ \ | | | | | | | | | | | | | Consistent diff and blob size limit names See merge request !11776 | ||||
| * | | Change no_limits to limitsdm-collapsed-blob | Douwe Maan | 2017-05-31 | 2 | -2/+2 |
| | | | |||||
| * | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 2 | -2/+2 |
| | | | |||||
* | | | Remove some deprecated methodstc-improve-project-api-perf | Toon Claes | 2017-05-30 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | To avoid the use of slow queries, remove some deprecated methods and encourage the use of ProjectFinder to find projects. | ||||
* | | | Copy `filter_projects` helper to V3 | Toon Claes | 2017-05-30 | 1 | -0/+27 |
|/ / | | | | | | | | | The helper will be modified in V4, so copy the original to V4 to keep the current behavior in V3. | ||||
* | | Merge branch 'rework-authorizations-performance' into 'master' | Douwe Maan | 2017-05-29 | 2 | -2/+9 |
|\ \ | | | | | | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885 | ||||
| * | | Hide nested group UI/API support for MySQL | Yorick Peterse | 2017-05-17 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | This hides/disables some UI elements and API parameters related to nested groups when MySQL is used, since nested groups are not supported for MySQL. | ||||
* | | | Revert "Remove changes that are not absolutely necessary" | Douwe Maan | 2017-05-24 | 1 | -1/+1 |
| |/ |/| | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5 | ||||
* | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c | Douwe Maan | 2017-05-16 | 1 | -2/+4 |
| | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
* | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" | Douwe Maan | 2017-05-15 | 1 | -4/+2 |
| | | | | | | This reverts merge request !11287 | ||||
* | | Rename `build_events` to `job_events` in code | Bob Van Landuyt | 2017-05-15 | 1 | -2/+4 |
|/ | |||||
* | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵ | Robert Speicher | 2017-05-10 | 4 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063 | ||||
| * | Enable the Style/TrailingCommaInArguments cop | Rémy Coutable | 2017-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' | Douwe Maan | 2017-05-10 | 1 | -1/+1 |
| | | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096 | ||||
* | | Merge branch 'snippets-finder-visibility' into 'security' | Douwe Maan | 2017-05-10 | 2 | -4/+3 |
|/ | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094 | ||||
* | Use relative paths for group/project/user avatars | blackst0ne | 2017-05-10 | 1 | -2/+6 |
| | |||||
* | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵ | Kamil Trzciński | 2017-05-06 | 1 | -3/+7 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494 | ||||
| * | Check ability to update build on the API resource | Grzegorz Bizon | 2017-05-05 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵ | Valery Sizov | 2017-05-05 | 1 | -1/+1 |
|\ \ | |/ | | | | | skip] | ||||
| * | Merge branch '12910-uploader-pers-snippet' into 'master' | Sean McGivern | 2017-05-04 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022 | ||||
| | * | Support uploaders for personal snippets comments12910-uploader-pers-snippet | Jarka Kadlecova | 2017-05-02 | 1 | -1/+1 |
| | | | |||||
| | * | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465ac | Stan Hu | 2017-04-29 | 1 | -2/+2 |
| | | | | | | | | | This reverts merge request !10845 | ||||
| | * | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-select | Toon Claes | 2017-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids | ||||
* | | | [Multiple issue assignee]: reslving some conflicts | Valery Sizov | 2017-05-04 | 1 | -4/+0 |
| | | | |||||
* | | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 4 | -16/+30 |
|/ / | |||||
* | | Fix how to use PipelinesFinder | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | |||||
* | | Fix 404 when upstream has disabled merge requests | mhasbini | 2017-04-27 | 1 | -0/+2 |
|/ | |||||
* | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 2 | -4/+4 |
| | |||||
* | Remove the User#is_admin? method | blackst0ne | 2017-04-09 | 4 | -4/+4 |
| | |||||
* | Merge branch 'microsoft-teams-integration' into 'master' | Douwe Maan | 2017-04-06 | 1 | -0/+6 |
|\ | | | | | | | | | adds initial microsoft teams integration See merge request !10412 | ||||
| * | adds relevant tests | Tiago Botelho | 2017-04-06 | 1 | -0/+6 |
| | | |||||
* | | Optimise trace handling code to use streaming instead of full read | Kamil Trzciński | 2017-04-06 | 1 | -1/+1 |
| | | |||||
* | | ProjectsFinder should handle more options | Jacopo | 2017-04-06 | 3 | -3/+3 |
|/ | | | | | | | | | | | | | | | | | | | Extended ProjectFinder in order to handle the following options: - current_user - which user use - project_ids_relation: int[] - project ids to use - params: - trending: boolean - non_public: boolean - starred: boolean - sort: string - visibility_level: int - tags: string[] - personal: boolean - search: string - non_archived: boolean GroupProjectsFinder now inherits from ProjectsFinder. Changed the code in order to use the new available options. | ||||
* | Merge branch '23655-api-group-issues' into 'master' | Rémy Coutable | 2017-03-29 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | Fix API group/issues default state filter Closes #23655 See merge request !10253 | ||||
| * | Fix API group/issues default state filter | Alexander Randa | 2017-03-28 | 1 | -2/+2 |
| | | |||||
* | | Implement new service for creating user | George Andrinopoulos | 2017-03-27 | 1 | -0/+53 |
|/ | |||||
* | Return 404 in project issues API endpoint when project cannot be found | Adam Niedzielski | 2017-03-20 | 1 | -1/+1 |
| | | | | Closes #29631 | ||||
* | Allow dot in branch name in trigger/builds endpoint in API | George Andrinopoulos | 2017-03-20 | 1 | -1/+1 |
| | |||||
* | Use "branch_name" instead "branch" on V3 branch creation API29604-v3-fix-branch-creation | Oswaldo Ferreira | 2017-03-16 | 1 | -0/+21 |
| | |||||
* | Merge branch '27988-fix-transient-failure-in-commits-api' into 'master' | Sean McGivern | 2017-03-16 | 27 | -32/+36 |
|\ | | | | | | | | | | | | | Ensure dots in project and group ID are allowed in the API endpoints Closes #27988 See merge request !9944 | ||||
| * | Add `requirements: { id: %r{[^/]+} }` for all projects and groups namespaced ↵ | Rémy Coutable | 2017-03-16 | 27 | -32/+36 |
| | | | | | | | | | | | | API routes Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Ensure dots in project path is allowed in the commits API | Rémy Coutable | 2017-03-14 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> |