summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Error 500 when repositories contain annotated tags pointing to blobssh-fix-annotated-tags-pointing-to-blobStan Hu2017-01-263-1/+40
| | | | | | | | | | | In repositories such as https://github.com/git/git.git, annotated tags can point to blobs, not necessarily to commits. `Repository` attempts to return the tags in the order of the commit date, but if a commit is not available the previous implementation would error due to a `nil` target. This change modifies the code to use the current time if a commit is not associated with the given tag. Closes #27228
* Update CHANGELOG.md for 8.16.2DJ Mountney2017-01-256-19/+8
| | | [ci skip]
* Merge branch '27013-regression-in-commit-title-bar' into 'master' Annabel Dunstone Gray2017-01-254-3/+12
|\ | | | | | | | | | | | | Resolve "regression in commit title bar" Closes #27013 See merge request !8751
| * fixed points from comments to improve code qualitydimitrieh2017-01-252-4/+5
| |
| * added changelog entry27013-regression-in-commit-title-bardimitrieh2017-01-241-0/+4
| |
| * fixed repo view, last commit, with updated clipboard button orderdimitrieh2017-01-241-1/+6
| |
| * fixed commit title bardimitrieh2017-01-241-2/+1
| |
* | Merge branch ↵Annabel Dunstone Gray2017-01-254-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '24895-branch-index-delete-button-inconsistently-spaced-and-misaligned' into 'master' Resolve "Branch index delete button inconsistently spaced and misaligned" Closes #24895 See merge request !8646
| * | properly center dropdown menu button in content-list context24895-branch-index-delete-button-inconsistently-spaced-and-misalignedMike Greiling2017-01-231-1/+2
| | |
| * | remove whitespace surrounding inline list controlsMike Greiling2017-01-232-2/+2
| | |
| * | remove whitespace surrounding dropdown buttonMike Greiling2017-01-231-1/+1
| | |
* | | Merge branch 'display-project-id' into 'master' 26001-show-tags-which-contain-a-given-commit-in-their-own-metadata-row-on-the-commit-page-widgetClement Ho2017-01-252-4/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display project ID Closes #18350 See merge request !8572
| * | | Display project ID in project settings (!8572)winniehell2017-01-252-4/+15
| | | |
* | | | Merge branch 'fix/26518' into 'master' Douwe Maan2017-01-254-6/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix access to the wiki code via HTTP when repository feature disabled Closes #26518 See merge request !8758
| * | | | Add CHANGELOG entryfix/26518Douglas Barbosa Alexandre2017-01-251-0/+4
| | | | |
| * | | | Fix access to the wiki code via HTTP when repository feature disabledDouglas Barbosa Alexandre2017-01-253-6/+34
| | | | |
* | | | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-2512-41/+911
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFM See merge request !8597
| * | | | | Statisfy eslintcopy-as-mdDouwe Maan2017-01-252-13/+13
| | | | | |
| * | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-25177-526/+1392
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * | | | | Run tests in a single browser sessionDouwe Maan2017-01-241-66/+81
| | | | | |
| * | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-24417-1774/+4185
| |\ \ \ \ \
| * | | | | | Improve handling of code blocks containing triple backticksDouwe Maan2017-01-192-4/+30
| | | | | | |
| * | | | | | Improve support for linebreaks, tables and nested blockquotes in listsDouwe Maan2017-01-192-15/+31
| | | | | | |
| * | | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-19489-2201/+6387
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * | | | | | | Remove unneeded checksDouwe Maan2017-01-191-4/+0
| | | | | | | |
| * | | | | | | Trigger autosize on the textarea after pastingDouwe Maan2017-01-192-1/+16
| | | | | | | |
| * | | | | | | Don't copy as GFM when more than GFM is selectedDouwe Maan2017-01-192-0/+6
| | | | | | | |
| * | | | | | | Remove unneeded codeDouwe Maan2017-01-192-4/+2
| | | | | | | |
| * | | | | | | Properly copy/paste allowed HTMLDouwe Maan2017-01-192-0/+53
| | | | | | | |
| * | | | | | | No needed to create an arrayDouwe Maan2017-01-181-2/+2
| | | | | | | |
| * | | | | | | Satisfy eslintDouwe Maan2017-01-182-65/+64
| | | | | | | |
| * | | | | | | Satisfy RubocopDouwe Maan2017-01-181-2/+0
| | | | | | | |
| * | | | | | | Move some functions to utilsDouwe Maan2017-01-184-61/+63
| | | | | | | |
| * | | | | | | Add more SyntaxHighlightFilter and MathFilter testsDouwe Maan2017-01-173-21/+150
| | | | | | | |
| * | | | | | | Fix ShortcutsIssuable#replyWithSelectedText testsDouwe Maan2017-01-173-34/+67
| | | | | | | |
| * | | | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-173-5/+6
| | | | | | | |
| * | | | | | | Don't copy if there's nothing to copyDouwe Maan2017-01-161-0/+2
| | | | | | | |
| * | | | | | | Improve specDouwe Maan2017-01-163-157/+163
| | | | | | | |
| * | | | | | | Address style feedbackDouwe Maan2017-01-161-143/+150
| | | | | | | |
| * | | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFMDouwe Maan2017-01-169-28/+595
| | | | | | | |
* | | | | | | | Merge branch '26186-diff-view-plus-and-minus-signs-as-part-of-line-number' ↵Annabel Dunstone Gray2017-01-256-2/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Color + and - signs in diffs to increase code legibility Closes #26186 See merge request !8768
| * | | | | | | | fix for all themes26186-diff-view-plus-and-minus-signs-as-part-of-line-numberdimitrieh2017-01-256-4/+66
| | | | | | | | |
| * | | | | | | | Color + and - signs in diffs to increase code legibilitydimitrieh2017-01-252-0/+6
| | | | | | | | |
* | | | | | | | | Merge branch '27021-line-numbers-now-in-copy-pasta-data' into 'master' Fatih Acet2017-01-252-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Line numbers now in copy pasta data" Closes #27021 See merge request !8706
| * | | | | | | | | Prevent copying of line numbers in parallel diff view27021-line-numbers-now-in-copy-pasta-datasamrose32017-01-222-2/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-2535-29/+325
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
| * | | | | | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-2535-29/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Update CHANGELOG.md for 8.14.8Alejandro Rodríguez2017-01-251-0/+8
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'label-select-toggle' into 'master' kamil-test-branchFatih Acet2017-01-253-1/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed label select toggle not updating correctly Closes #26119 See merge request !8601
| * | | | | | | | | | Fixed label select toggle not updating correctlylabel-select-togglePhil Hughes2017-01-163-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #26119
View Lorry Controller Status