summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-162-36/+59
| | | | | | | | | | | | | gitlab-shell v3.6.6 would give project paths like so: * namespace/project gitlab-shell v4.0.0 can give project paths like so: * /namespace1/namespace2/project * /namespace/project * /path/to/repository/storage/namespace1/namespace2/project * /path/to/repository/storage/namespace/project
* Merge branch 'grapify-merge-request-api' into 'master' Rémy Coutable2016-11-151-162/+110
|\ | | | | | | | | | | | | | | | | | | | | Grapify the merge request API Grapfiy the merge request API. I removed the test for checking if the source branch can be changed since this is an unused parameter. IMHO the test does not make sense. ## What are the relevant issue numbers? Related to #22928 See merge request !7358
| * Grapify the merge request APIgrapify-merge-request-apiRobert Schilling2016-11-151-162/+110
| |
* | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #4270: Recursive option for files through API ## What does this MR do? - Adds recursive param to tree API request. With this param we can get all repository paths in a single request. - Related [old github pull request](https://github.com/gitlabhq/gitlabhq/pull/9311) ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Requested in #4270 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [x] All builds are passing - [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 you do - 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? Requested in #4270 See merge request !6088
| * | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-2/+4
| | |
* | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to delete all merged branches ## What does this MR do? It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. **Note** ~~This MR is WIP until MR !6408 is merged.~~ ## Are there points in the code the reviewer needs to double check? The UX of the actual "Delete merged branches" button. ## Why was this MR needed? Fixes #21076 ## Screenshots ![Branches page without "Delete all merged" button](/uploads/3a2936a83c3547a0fce92a74af880a2d/Screen_Shot_2016-10-17_at_20.06.30.png) Before: ![Screen_Shot_2016-10-17_at_20.07.11](/uploads/55efcebf4e0a45dbfc70ba4a11ca152c/Screen_Shot_2016-10-17_at_20.07.11.png) After: ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] 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 you do - 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? Closes #21076 See merge request !6449
| * | | Add button to delete all merged branchesToon Claes2016-11-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. Fixes #21076.
* | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-151-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when creating a merge request that contains an image that was deleted and added _Originally opened at !4816 by @stanhu._ - - - ## What does this MR do? This MR fixes an Error 500 when creating a merge request that contains an image that was deleted and added. Before, when displaying the before and after image, the code would always retrieve the image from the parent commit. However, in a diff, this could cause two different problems: The "before" image may not actually be the image you want to compare against (regression of #14327) It may appear as though a file was modified when it was really just added during the diff ## Are there points in the code the reviewer needs to double check? There may be a more elegant to fix this bug. ## What are the relevant issue numbers? Closes #3893, gitlab-org/gitlab-ee#678 See merge request !7457
| * | | | Fix Error 500 when creating a merge request that contains an image that was ↵stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-5/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted and added Steps to reproduce: 1. Start with a repo with an image 2. Add a commit to delete the image 3. Add another commit to replace the image with another image In a diff comparison, we really just compare about what the image was before the diff, not the direct parent of the last commit. This MR fixes that. Closes #3893, gitlab-org/gitlab-ee#678 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-151-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be found by uid Unfortunately, SAML IDs can be an LDAP UID, DN, or something else entirely. UID and DN are most common, though. This adds a fallback scenario so we first try to find a matching LDAP user by UID, then by DN. This will fix a problem for the customer in https://gitlab.zendesk.com/agent/tickets/43298 See merge request !7002
| * | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be ↵Drew Blessing2016-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | found by uid
* | | | | Use declared_params helper in APIgrapify-declared-paramsRobert Schilling2016-11-1412-36/+20
| |/ / / |/| | |
* | | | Merge branch 'grapify-to-h' into 'master' Rémy Coutable2016-11-143-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use to_h to convert params to a hash See merge request !7406
| * | | | Use #to_h to convert params to a hashgrapify-to-hRobert Schilling2016-11-143-7/+9
| |/ / /
* | | | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' Kamil Trzciński2016-11-1430-106/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve naming convention in ci configuration module ## What does this MR do? This MR improves the naming convention in CI configuration module to reflect the domain design better. ## What are the relevant issue numbers? Related to #15060 See merge request !7448
| * | | | Fix indentation in CI variables entry classGrzegorz Bizon2016-11-141-1/+1
| | | | |
| * | | | Change name of method for setting CI config entriesGrzegorz Bizon2016-11-144-26/+26
| | | | |
| * | | | Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-configGrzegorz Bizon2016-11-1430-105/+103
| | |_|/ | |/| |
* | | | Merge branch 'grapify-subscription-api' into 'master' Rémy Coutable2016-11-141-23/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify subscription API ## What are the relevant issue numbers? Related to #22928 See merge request !7380
| * | | | Grapify subscription APIRobert Schilling2016-11-141-23/+14
| | |_|/ | |/| |
* | | | Merge branch 'sh-fix-sidekiq-throttling-init' into 'master' Robert Speicher2016-11-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only turn on Sidekiq throttling if column exists If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452 See merge request !7446
| * | | | Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-initStan Hu2016-11-121-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452
* | | | Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-143-14/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296 See merge request !6606
| * | | | Centralize LDAP config/filter logicDrew Blessing2016-11-113-14/+61
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Centralize all LDAP config logic in `GitLab::LDAP::Config`. Previously, some logic was in the Devise initializer and it was not honoring the `user_filter`. If a user outside the configured `user_filter` signed in, an account would be created but they would then be denied access. Now that logic is centralized, the filter is honored and users outside the filter are never created.
* | | | Merge branch 'repository-name-emojis' into 'master' Rémy Coutable2016-11-141-3/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Added ability to put emojis into repository name ## Are there points in the code the reviewer needs to double check? Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt See merge request !7420
| * | | Added ability to put emojis into repository nameVincent Composieux2016-11-121-3/+3
| | |/ | |/| | | | | | | Added ability to put emojis into repository name
* | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-112-0/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow certain Sidekiq jobs to be throttled ## What does this MR do? Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. ![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Related to #23352 See merge request !7292
| * | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-111-6/+8
| | | |
| * | | Refactored initializer code to its own class and added testsPatricio Cano2016-11-101-0/+21
| | | |
| * | | Allow the Sidekiq queues to throttle and the factor by which to throttle ↵Patricio Cano2016-11-101-0/+4
| | | | | | | | | | | | | | | | them to be configurable
| * | | Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+1
| |/ /
* | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-112-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Fix the collapsed diff when converting a symlink to a regular file #21610 !6828 See merge request !6953
| * | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-102-2/+2
| | | | | | | | | | | | | | | In this case comparing old_path and new_path is not enough because there are two entires that match.
* | | Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-101-46/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
| * | | Grapify token APIRobert Schilling2016-11-101-46/+30
| | | |
* | | | Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master' Robert Speicher2016-11-102-82/+96
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve ee_compat_check task (part 3)" Improve the `ee_compat_check` task with caching and keep artifacts on failure. Closes #23945. See merge request !7177
| * | | | Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3Rémy Coutable2016-11-102-82/+96
| |/ / / | | | | | | | | | | | | | | | | | | | | ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable2016-11-101-54/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
| * | | | Grapify milestones APIgrapify-milestone-apiRobert Schilling2016-11-101-54/+57
| | |_|/ | |/| |
* | | | Merge branch 'grapify-runners-api' into 'master' Rémy Coutable2016-11-101-53/+64
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
| * | | Grapify runners APIRobert Schilling2016-11-101-53/+64
| |/ /
* | | Merge branch 'grapify-session-api' into 'master' Rémy Coutable2016-11-101-10/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
| * | | Grapify the session APIgrapify-session-apiRobert Schilling2016-11-091-10/+9
| |/ /
* | | Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern2016-11-101-0/+10
|\ \ \ | |_|/ |/| | | | | | | | Add api endpoint `/groups/owned` See merge request !7103
| * | Added API endpoint groups/ownedBorja Aparicio2016-11-081-0/+10
| | |
* | | Merge branch '23731-add-param-to-user-api' into 'master' Sean McGivern2016-11-091-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109
| * | | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-081-1/+6
| | | |
* | | | Merge branch 'ldap_check_bind' into 'master' Sean McGivern2016-11-092-13/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ldap:check errors Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21621. See merge request !6601
| * | | | Introduce better credential and error checking to `rake gitlab:ldap:check`Drew Blessing2016-11-082-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was previously possible for invalid credential errors to go unnoticed in this task. Users would believe everything was configured correctly and then sign in would fail with 'invalid credentials'. This adds a specific bind check, plus catches errors connecting to the server. Also, specs :)
* | | | | Merge branch '23403-fix-events-for-private-project-features' into 'security'Robert Speicher2016-11-091-25/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect project visibility settings in the contributions calendar This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403 See merge request !2019 Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status