Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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> | ||||
* | | Add 'Undo mark all as done' to Todos | Jacopo | 2017-03-16 | 1 | -2/+2 |
|/ | | | | | | Added the ability to 'Undo mark all as done' todos marked as complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard. The operation undos only the todo previously marked as done with the 'Mark al as done' button. | ||||
* | Make API v3 work with the new param name | Bob Van Landuyt | 2017-03-13 | 1 | -0/+1 |
| | |||||
* | Make API v3 compatible with the changes in `Issues::CreateService` | Bob Van Landuyt | 2017-03-13 | 1 | -6/+0 |
| | |||||
* | Merge branch 'issue_16834' | Douwe Maan | 2017-03-07 | 1 | -0/+54 |
|\ | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md | ||||
| * | Remove unecessary endpoint from repository, add compatibility endpoints for ↵issue_16834 | Felipe Artur | 2017-03-07 | 1 | -0/+54 |
| | | | | | | | | v3 and several improvements | ||||
* | | Remove user_can_download_artifacts | Toon Claes | 2017-03-07 | 1 | -16/+8 |
|/ | | | | It was actually not used anywhere. | ||||
* | Implement review comments from @dbalexandre28251-mr-and-issue-iids-for-api-v4 | Timothy Andrew | 2017-03-07 | 1 | -1/+1 |
| | | | | | | - Typo in docs - Newline between test/expectation in `api/issues_spec` - Use `find_by` instead of `reference_by` in the structure defining awardables | ||||
* | Fix time tracking endpoints for API v4 | Timothy Andrew | 2017-03-07 | 1 | -0/+116 |
| | | | | | | - Use issue/merge_request IID instead of ID - Duplicate the original `TimeTrackingEndpoints` concern (+ specs) for V3, since this is a breaking change. | ||||
* | Migrate the AwardEmoji API to use `merge_request_iid` and `issue_iid` | Timothy Andrew | 2017-03-07 | 1 | -4/+75 |
| | | | | | | | | - Instead of `merge_request_id` and `issue_id` - The API also deals with `snippet_id`, which remains unchanged (since snippets don't have `iid`s - Duplicate the original `AwardEmoji` API (and spec) for use with the V3 API, since this is a breaking change. | ||||
* | API routes referencing a specific merge request should use the MR `iid` | Timothy Andrew | 2017-03-07 | 1 | -0/+10 |
| | | | | | | - As opposed to the `id` that was previously being used. - This brings the API routes closer to the web interface's routes. - This is specific to API v4. |