Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2016-11-29Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern
Add setting to enable/disable HTML emails Closes #24880 See merge request !7749
2016-11-29Merge branch 'zj-issue-search-slash-command' into 'master' Kamil Trzciński
Add issue search slash command See merge request !7752
2016-11-29Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan
Replace issue access checks with use of IssuableFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested ### Issue lookup with access check Using `visible_to_user` likely makes these security issues too. See [Code smells](#code-smells). - [x] :vertical_traffic_light: app/finders/notes_finder.rb:15 [`visible_to_user`] - [x] :traffic_light: app/views/layouts/nav/_project.html.haml:73 [`visible_to_user`] [`.count`] - [x] :white_check_mark: app/services/merge_requests/build_service.rb:84 [`issue.try(:confidential?)`] - [x] :white_check_mark: lib/api/issues.rb:112 [`visible_to_user`] - CHANGELOG: Prevented API returning issues set to 'Only team members' to everyone - [x] :white_check_mark: lib/api/helpers.rb:126 [`can?(current_user, :read_issue, issue)`] Maybe here too? - [x] :white_check_mark: lib/gitlab/search_results.rb:53 [`visible_to_user`] ### Previous discussions - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b2ff264eddf9819d7693c14ae213d941494fe2b3_128_126 - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#7b6375270d22f880bdcb085e47b519b426a5c6c7_87_87 See merge request !2031
2016-11-29Merge branch 'zj-fix-label-creation-non-members' into 'security'Douwe Maan
Fix label creation non members Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23416 See merge request !2006
2016-11-29Add new configuration setting to enable/disable HTML emails.Ruben Davila
This new global setting will allow admins to specify if HTML emails should be sent or not, this is basically useful when system administrators want to save some disk space by avoiding emails in HTML format and using only the Plain Text version.
2016-11-28Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan
Refresh project authorizations using a Redis lease This MR changes `User#refresh_authorized_projects` so it uses a Redis lease instead of relying on serializable transactions. See the commit message(s) for more details. See merge request !7733
2016-11-25Merge branch 'zj-expose-coverage-pipelines' into 'master' Rémy Coutable
Expose coverage on GET pipelines/:id Closes gitlab-org/gitlab-ce#24801 See merge request !7670
2016-11-25Merge branch 'timeout-merge-request-for-binary-file' into 'master' Yorick Peterse
Fix: Timeout creating and viewing merge request for binary file See merge request !7713
2016-11-25Expose coverage on GET pipelines/:idZ.J. van de Weg
The coverage wasn't exposed yet, now it is but only for detailed requests to save queries on the database.
2016-11-25Add issue search slash commandZ.J. van de Weg
One of many requested in: gitlab-org/gitlab-ce#24768
2016-11-25Fix: Timeout creating and viewing merge request for binary fileValery Sizov
2016-11-25Merge branch 'zj-slash-commands-improvements' into 'master' Kamil Trzciński
Slash commands improvements See merge request !7638
2016-11-25Refresh project authorizations using a Redis leaseYorick Peterse
When I proposed using serializable transactions I was hoping we would be able to refresh data of individual users concurrently. Unfortunately upon closer inspection it was revealed this was not the case. This could result in a lot of queries failing due to serialization errors, overloading the database in the process (given enough workers trying to update the target table). To work around this we're now using a Redis lease that is cancelled upon completion. This ensures we can update the data of different users concurrently without overloading the database. The code will try to obtain the lease until it succeeds, waiting at least 1 second between retries. This is necessary as we may otherwise end up _not_ updating the data which is not an option.
2016-11-25Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse
Resolve "Reduce queries in API::Helpers#find_project" See merge request !7714
2016-11-25Accept a valid ref for issue showZ.J. van de Weg
For example, now we support `/gitlab issue show #1`. Where the # used to trip the regex.
2016-11-24API: Introduce `#find_group!` which also check access permissionRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Merge branch 'api-no-convert' into 'master' Rémy Coutable
Don't convert data which already is the target type With Grape's DSL we already enforce data types. We don't need to explicitly convert to string if there is already one. See merge request !7740
2016-11-24API: Introduce `#find_project!` which also check access permissionRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Don't convert data which already is the target typeRobert Schilling
2016-11-24API: Use `#find_project` in API::Triggers and API::ServicesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Make API::Helpers find a project with only one queryRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan
Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 !7459
2016-11-23Use Commit#author so we share logic and cacheLin Jen-Shin
Closes #24900
2016-11-23Merge branch 'api-delete-group-share' into 'master' Rémy Coutable
API: Add endpoint to delete a group share Closes #24771 See merge request !7662
2016-11-23Merge branch 'grapify-sidekiq-metric-api' into 'master' Rémy Coutable
Grapify the sidekiq metrics API Related to #22928 See merge request !7699
2016-11-23Merge branch 'milestone_start_date' into 'master' Sean McGivern
Add a starting date to milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704 See merge request !7484
2016-11-23Merge branch 'post_receive-any-email' into 'master' Sean McGivern
post_receive: accept any user email from last commit See merge request !7225
2016-11-23Grapify the sidekiq metrics APIRobert Schilling
2016-11-23Add nested groups support to the routingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-23API: Add endpoint to delete a group shareRobert Schilling
2016-11-23Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master' Rémy Coutable
Ensure we sanitize branch names with path-unfriendly characters See merge request !7696
2016-11-23Add a starting date to milestonesValery Sizov
2016-11-23Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan
Fix cycle analytics plan stage when commits are missing Takes into account when commits are `nil` so the app doesn't throw an exception and also removes them. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24836 - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7694
2016-11-23Ensure we sanitize branch names with path-unfriendly charactersRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-23Fix and relevant spec for plan stage breaking with nil commitsJames Lopez
2016-11-22Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master' Kamil Trzciński
Issue creation now accepts trailing whitespace See merge request !7633
2016-11-22Merge branch 'fix-api-iid-filter' into 'master' Rémy Coutable
Fix IID filter for merge requests and milestones I updated the example in the docs and added a test. The milestones API was also broken for the same reason. Related to !7358 and !7373 See merge request !7648
2016-11-22Merge branch ↵Rémy Coutable
'23532-define-common-helper-for-describe-pagination-params-in-api' into 'master' Add concern for reuse pagination params declaration in API Closes #23532 See merge request !7646
2016-11-22Merge branch 'avoid-api-helper-call' into 'master' Rémy Coutable
Avoid helper call with default parameters The helpers can ultimately be removed when the issue API uses the Grape DSL. See merge request !7649
2016-11-22Avoid helper call with default parametersRobert Schilling
2016-11-22Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński
Fix undefined error in CI linter ## What does this MR do? This MR fixes undefined error in CI linter. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24759 See merge request !7650
2016-11-22Fix entry lookup in CI config inheritance rulesGrzegorz Bizon
2016-11-22Issue creation now accepts trailing whitespaceZ.J. van de Weg
2016-11-22Fix IID filter for merge requests and milestonesRobert Schilling
2016-11-22Merge branch '24730-broken-master' into 'master' Robert Speicher
Fix StrongAttibutes error with Ruby 2.1 Closes #24730 See merge request !7625
2016-11-22Define common helper for describe pagination params in apiSemyon Pupkov
2016-11-22Merge branch 'improve-deploy-message' into 'master' Kamil Trzciński
Improve deploy message ## What does this MR do? Improves deploy message to make it more descriptive and useable then what is already offered by deploy command. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7629
2016-11-21Merge branch 'dz-fix-500-group-git' into 'master' Sean McGivern
Fix 500 error when group name ends with git Closes https://gitlab.com/gitlab-com/support-forum/issues/1298 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24742 See merge request !7630
2016-11-21Improve deploy command messageKamil Trzcinski
2016-11-21Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable
Add deploy chat command This adds a new ChatOps command: ``` /trigger deploy <environment> to <environment> ``` See merge request !7619
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 18:52:47 +0300