summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-151-1/+9
|
* Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-153-2/+122
|
* Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-142-0/+36
|
* Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1416-43/+284
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
| * Remove trailing blank line from Allowable moduleGrzegorz Bizon2016-12-141-1/+0
| |
| * Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon2016-12-132-1/+7
| |
| * Extract abilities checking module from ability modelGrzegorz Bizon2016-12-132-1/+9
| |
| * Refine build stop/play extended status specsGrzegorz Bizon2016-12-131-4/+4
| |
| * Use manual build icon in play/stop build statusesGrzegorz Bizon2016-12-132-4/+12
| |
| * Add specs for build stop extended detailed statusGrzegorz Bizon2016-12-121-4/+0
| |
| * Fix build stop extended status CSS classGrzegorz Bizon2016-12-121-4/+0
| |
| * Fix path to build status details in common helpersGrzegorz Bizon2016-12-121-1/+1
| |
| * Add action_class/action_titleKamil Trzcinski2016-12-125-3/+30
| |
| * Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-124-5/+5
| |
| * Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-122-1/+2
| |
| * Incorporate permission checks into new CI statusesGrzegorz Bizon2016-12-1211-49/+60
| | | | | | | | [ci skip]
| * Refactor ci status factories to DRY code a littleGrzegorz Bizon2016-12-125-29/+28
| |
| * Check permission of detailsKamil Trzcinski2016-12-124-7/+7
| |
| * Introduce `cancelable` and `returnable` [ci skip]Kamil Trzcinski2016-12-125-35/+64
| |
| * Improve actionsKamil Trzcinski2016-12-124-18/+106
| |
| * Added Ci::Status::BuildKamil Trzcinski2016-12-123-3/+76
| |
* | Merge branch 'api-cherry-pick' into 'master' Rémy Coutable2016-12-131-1/+35
|\ \ | | | | | | | | | | | | | | | | | | Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API? Closes #25450 See merge request !8047
| * | API: Ability to cherry-pick a commitRobert Schilling2016-12-131-1/+35
| |/
* | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-132-54/+77
|\ \ | | | | | | | | | | | | | | | | | | API: Memoize the current_user so that the sudo can work properly Closes #25482 See merge request !8017
| * | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-131-13/+11
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | API: Memoize the current_user so that the sudo can work properlyRémy Coutable2016-12-122-54/+79
| |/ | | | | | | | | | | | | | | The issue was arising when `#current_user` was called a second time after a user was impersonated: the `User#is_admin?` check would be performed on it and it would fail. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'api-simple-group-project' into 'master' Rémy Coutable2016-12-131-1/+4
|\ \ | | | | | | | | | | | | | | | | | | API: Ability to get group's project in simple representation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412 See merge request !8060
| * | API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-131-1/+4
| | |
* | | Merge branch 'dz-create-routes-lower-index' into 'master' Dmitriy Zaporozhets2016-12-131-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add index to routes table on lower path for postgresql Improve performance of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !8041
| * | | Add AddLowerPathIndexToRoutes to setup_postgresql.rakeDmitriy Zaporozhets2016-12-131-0/+4
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'allow-more-filenames' into 'master' Rémy Coutable2016-12-131-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002
| * | | Allow all alphanumeric characters in file names (!8002)winniehell2016-12-131-2/+2
| | |/ | |/|
* | | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Minor improvements to nested groups code See merge request !8011
| * | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' Sean McGivern2016-12-131-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Don't allow blank MR titles in API Closes #25033 See merge request !7848
| * | | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titlesRobert Schilling2016-12-131-2/+2
| | |/ | |/|
* | | Merge branch 'grapify-service-api' into 'master' Rémy Coutable2016-12-122-65/+572
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Grapify the service API Related to #22928 See merge request !7970
| * | | Grapify the service APIRobert Schilling2016-12-092-65/+572
| | | |
* | | | Merge branch 'unescape-relative-path' into 'master' Gabriel Mazetto2016-12-121-8/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid escaping relative links in Markdown twice ## What does this MR do? Avoid escaping relative links in Markdown twice. ## Why was this MR needed? Relative links with special characters (e.g. spaces) were escaped twice. ## What are the relevant issue numbers? closes #25191, #25318 See merge request !7940
| * | | | Avoid escaping relative links in Markdown twice (!7940)winniehell2016-12-121-8/+6
| | | | |
* | | | | Merge branch 'api-fix-group-projects-filter' into 'master' Rémy Coutable2016-12-121-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add the project filter to the groups endpoint. Related to #22928. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25420 See merge request !8034
| * | | | | API: Fix groups filterRobert Schilling2016-12-121-1/+10
| | | | | |
* | | | | | Merge branch 'issue_25030' into 'master' Sean McGivern2016-12-121-8/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow branch names with dots on API endpoint closes #25030 See merge request !7963
| * | | | | Allow branch names with dots on API endpointissue_25030Felipe Artur2016-12-081-8/+8
| | | | | |
* | | | | | Merge branch 'features/api-snippets' into 'master' Sean McGivern2016-12-124-0/+153
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for personal snippet endpoint on the API Closes #22042 See merge request !6373
| * | | | | API: Endpoint to expose personal snippets as /snippetsGuyzmo2016-12-014-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the necessary API for the new /snippets Restful resource added with this commit. Added a new Grape class `Snippets`, as well as a `PersonalSnippet` entity. Issue: #20042 Merge-Request: !6373 Signed-off-by: Guyzmo <guyzmo+gitlab+pub@m0g.net>
* | | | | | Merge branch 'api-remove-source-branch' into 'master' Rémy Coutable2016-12-091-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to remove source branch Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577 See merge request !7804
| * | | | | | API: Ability to remove source branchapi-remove-source-branchRobert Schilling2016-12-041-2/+6
| | | | | | |
* | | | | | | Merge branch 'dz-nested-groups' into 'master' Douwe Maan2016-12-092-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nested groups support on data level ## What does this MR do? - [x] Add `parent_id` field to `Namespace`model. - [x] Create new database table `routes` that keeps information about full path to each group or project - [x] Remove uniq index from `namespaces.path` - [x] Add uniq index on `routes.path` - [x] Fill routes table with path data from namespaces and projects - [x] Change Namespace/Project URL lookup by routes table - [x] Rename related routes (nested groups, projects) when parent path changes This is solely backend preparation. UI, Permissions and API support will be added in separate merge request. ## Are there points in the code the reviewer needs to double check? migrations, Route model, Routable concern Will require downtime. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121#note_19490281 discussion ## Why was this MR needed? One step further to full nested groups support ## Screenshots (if relevant) No UI changes in this merge request so far ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added~~ - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7121
| * | | | | | | Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-082-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add parent_id field to namespaces table to store relation with nested groups * create routes table to keep information about full path of every group and project * project/group lookup by full path from routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status