summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* fix spec failurefix/import-encrypt-attsJames Lopez2017-01-301-1/+1
|
* programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-301-0/+9
|
* rename method and added note to export file spec about new encrypted attributesJames Lopez2017-01-301-2/+2
|
* fix typoJames Lopez2017-01-301-1/+1
|
* Ignore encrypted attributes in Import/ExportJames Lopez2017-01-303-7/+11
| | | | | | | * Regenerates tokens for all models that have them * Remove variables, since they are basically just storing encrypted data * Bumped version up to 0.1.6 * Updated related docs
* update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-272-3/+3
|
* namespace assets rake tasks to gitlab:assets:*Mike Greiling2017-01-272-29/+47
|
* correct gzip files if they exist as wellMike Greiling2017-01-271-0/+19
|
* automatically correct CSS urls on assets:precompileMike Greiling2017-01-271-0/+10
|
* Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-272-0/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Move ApplicationSetting DEFAULTS to `.defaults` insteadRémy Coutable2017-01-271-2/+2
| | | | | | This will avoid autoloading issues in the long term. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-272-0/+6
|\ | | | | | | | | | | | | Don't override Ci::Build#user when presenting a build Closes #26943 See merge request !8668
| * Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee ↵26943-fix-user-in-build-presenterRémy Coutable2017-01-252-2/+6
| | | | | | | | | | | | already respond to method Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-241-1/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoding.default_external was chosen over Encoding.default_internal because File.read is returning Encoding.default_external, therefore we should align with it. Alternatively, we could force both of them to be Encoding.default_internal. However, ideally this should be determined by different projects. For example, some projects might want to use an encoding different to what GitLab is using. This might not happen soon though. Closes #27052
* | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-255-6/+16
|\ \ | | | | | | | | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFM See merge request !8597
| * \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-258-45/+29
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2432-174/+370
| |\ \ \
| * \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-1950-235/+744
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * | | | | Add more SyntaxHighlightFilter and MathFilter testsDouwe Maan2017-01-171-2/+4
| | | | | |
| * | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-171-0/+1
| | | | | |
| * | | | | Improve specDouwe Maan2017-01-161-3/+4
| | | | | |
| * | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFMDouwe Maan2017-01-165-6/+12
| | | | | |
* | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-254-0/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
| * | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-254-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two cases that could be problematic: 1. Because sometimes AuthorizedProjectsWorker would be scheduled in a transaction it was possible for a job to run/complete before a COMMIT; resulting in it either producing an error, or producing no new data. 2. When scheduling jobs the code would not wait until completion. This could lead to a user creating a project and then immediately trying to push to it. Usually this will work fine, but given enough load it might take a few seconds before a user has access. The first one is problematic, the second one is mostly just annoying (but annoying enough to warrant a solution). This commit changes two things to deal with this: 1. Sidekiq scheduling now takes places after a COMMIT, this is ensured by scheduling using Rails' after_commit hook instead of doing so in an arbitrary method. 2. When scheduling jobs the calling thread now waits for all jobs to complete. Solution 2 requires tracking of job completions. Sidekiq provides a way to find a job by its ID, but this involves scanning over the entire queue; something that is very in-efficient for large queues. As such a more efficient solution is necessary. There are two main Gems that can do this in a more efficient manner: * sidekiq-status * sidekiq_status No, this is not a joke. Both Gems do a similar thing (but slightly different), and the only difference in their name is a dash vs an underscore. Both Gems however provide far more than just checking if a job has been completed, and both have their problems. sidekiq-status does not appear to be actively maintained, with the last release being in 2015. It also has some issues during testing as API calls are not stubbed in any way. sidekiq_status on the other hand does not appear to be very popular, and introduces a similar amount of code. Because of this I opted to write a simple home grown solution. After all, all we need is storing a job ID somewhere so we can efficiently look it up; we don't need extra web UIs (as provided by sidekiq-status) or complex APIs to update progress, etc. This is where Gitlab::SidekiqStatus comes in handy. This namespace contains some code used for tracking, removing, and looking up job IDs; all without having to scan over an entire queue. Data is removed explicitly, but also expires automatically just in case. Using this API we can now schedule jobs in a fork-join like manner: we schedule the jobs in Sidekiq, process them in parallel, then wait for completion. By using Sidekiq we can leverage all the benefits such as being able to scale across multiple cores and hosts, retrying failed jobs, etc. The one downside is that we need to make sure we can deal with unexpected increases in job processing timings. To deal with this the class Gitlab::JobWaiter (used for waiting for jobs to complete) will only wait a number of seconds (30 by default). Once this timeout is reached it will simply return. For GitLab.com almost all AuthorizedProjectWorker jobs complete in seconds, only very rarely do we spike to job timings of around a minute. These in turn seem to be the result of external factors (e.g. deploys), in which case a user is most likely not able to use the system anyway. In short, this new solution should ensure that jobs are processed properly and that in almost all cases a user has access to their resources whenever they need to have access.
* | | | | | | Merge branch 'fix-ci-requests-concurrency' into 'master' Grzegorz Bizon2017-01-251-9/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI requests concurrency See merge request !8760
| * | | | | | | Return struct instead of multiple valuesKamil Trzcinski2017-01-251-5/+5
| | | | | | | |
| * | | | | | | Fix specsKamil Trzcinski2017-01-251-0/+1
| | | | | | | |
| * | | | | | | Fix picking CI buildsKamil Trzcinski2017-01-251-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conflict happens when we try to update a build, but fail to do so due to fact that we update the same build concurrently for two different runners.
* | | | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-252-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1078 See merge request !8657
| * | | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutesKamil Trzcinski2017-01-252-25/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-01-2430-172/+352
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | backport-ee-changes-for-build-minutes
| * | | | | | Backport changes introduced by ↵Kamil Trzcinski2017-01-203-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1083
* | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-253-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support notes without a project (personal snippets notes) See merge request !8468
| * | | | | | | address commentsJarka Kadlecova2017-01-251-0/+1
| | | | | | | |
| * | | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-183-5/+8
| | | | | | | |
* | | | | | | | Merge branch 'grapify-branch-api' into 'master'Rémy Coutable2017-01-251-6/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify last endpoint of the branches API See merge request !8755
| * | | | | | | | Grapify last endpoint of the branches APIgrapify-branch-apiRobert Schilling2017-01-241-6/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'mrchrisw/rake-redis' into 'master' Stan Hu2017-01-251-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add redis version to info rake task See merge request !8283
| * | | | | | | | Add redis version to info rake taskmrchrisw/rake-redisChris Wilson2017-01-241-1/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-243-34/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Dont persist application settings in test env See merge request !8715
| * | | | | | | | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bisRémy Coutable2017-01-232-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-232-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
* | | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵Sean McGivern2017-01-242-1/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allows to search within project by commit's hash #24833 Closes #24833 See merge request !8028
| * | | | | | | | | Search feature: redirects to commit page if query is commit sha and only ↵YarNayar2017-01-242-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit found See !8028 and #24833
| * | | | | | | | | Allows to search within project by commit's hashYarNayar2017-01-241-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was proposed in #24833
* | | | | | | | | | Merge branch 'zj-mattermost-api-update' into 'master' Grzegorz Bizon2017-01-243-8/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small update to the Mattermost API See merge request !8712
| * | | | | | | | | | Small update to the Mattermost APIzj-mattermost-api-updateZ.J. van de Weg2017-01-243-8/+18
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes make it possible to wrap multiple API requests in one session.
* | | | | | | | | | Merge branch 'grapify-deploy-keys' into 'master' Rémy Coutable2017-01-241-9/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify all endpoints of the deploy keys API See merge request !8721
| * | | | | | | | | Grapify all endpoints of the deploy keys APIgrapify-deploy-keysRobert Schilling2017-01-231-9/+8
| | |/ / / / / / / | |/| | | | | | |