summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only instantiate Queue in testgrpc-unavailable-restartJacob Vosmaer2018-02-231-11/+11
|
* changelogJacob Vosmaer2018-02-231-0/+5
|
* move method backJacob Vosmaer2018-02-231-4/+4
|
* Remove pid magicJacob Vosmaer2018-02-232-7/+8
|
* Simplify pidJacob Vosmaer2018-02-232-7/+4
|
* Fix race conditions in tests, I hopeJacob Vosmaer2018-02-232-59/+52
|
* Make spec thread-safe, hopefullyJacob Vosmaer2018-02-232-34/+88
|
* Prevent process shutdown during testJacob Vosmaer2018-02-232-5/+17
|
* Handle grpc unavailable logic in separate methodJacob Vosmaer2018-02-231-8/+13
|
* Re-raise WantShutdown exceptionJacob Vosmaer2018-02-222-6/+23
|
* Move specJacob Vosmaer2018-02-221-2/+2
|
* Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer2018-02-223-8/+43
|
* Merge branch 'dispatcher-import-batch-3' into 'master'Jacob Schatz2018-02-2222-131/+32
|\ | | | | | | | | Use dynamic imports in dispatcher (Part 3) See merge request gitlab-org/gitlab-ce!17277
| * Use dynamic imports in dispatcher (Part 3)Clement Ho2018-02-2222-131/+32
|/
* Merge branch 'patch-28' into 'master'Marcia Ramos2018-02-221-1/+1
|\ | | | | | | | | Add link to project visibility settings in push to create project docs See merge request gitlab-org/gitlab-ce!17292
| * Add link to project visibility settings in push to create project docsPedro Moreira da Silva2018-02-221-1/+1
| |
* | Merge branch 'docs-milestones-refactor' into 'master'Marcia Ramos2018-02-228-40/+88
|\ \ | | | | | | | | | | | | Docs milestones refactor See merge request gitlab-org/gitlab-ce!17247
| * | Update docs milestonesdocs-milestones-refactorVictor Wu2018-02-218-40/+88
| | |
* | | Merge branch 'docs-replace-prod-names' into 'master'🚄 Job van der Voort 🚀2018-02-2211-22/+45
|\ \ \ | | | | | | | | | | | | | | | | Docs: search/replace "Enterprise Edition" and adjust when applicable See merge request gitlab-org/gitlab-ce!17161
| * | | Docs: search/replace "Enterprise Edition" and adjust when applicableMarcia Ramos2018-02-2211-22/+45
|/ / /
* | | Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-226-1/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
| * | | Fix 500 error when loading an invalid upload URLSean McGivern2018-02-226-1/+40
| | | |
* | | | Merge branch 'revert-3487441b' into 'master'Sean McGivern2018-02-223-12/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'tc-info-version-check' into 'master'" See merge request gitlab-org/gitlab-ce!17269
| * | | | Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441bVictor Wu2018-02-213-12/+3
| | | | | | | | | | | | | | | This reverts merge request !17257
* | | | | Merge branch ↵Achilleas Pipinellis (🌴 Feb 23 - Mar 04 🌴)2018-02-221-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43416-document-where-user-clone-fetch-activity-appears-in-the-logs' into 'master' Resolve "document where user clone/fetch activity appears in the logs" Closes #43416 See merge request gitlab-org/gitlab-ce!17227
| * | | | | add lines describing how to find user clone/fetch activity43416-document-where-user-clone-fetch-activity-appears-in-the-logsDiana Stanley2018-02-191-0/+4
| | | | | |
* | | | | | Merge branch 'reduce-ce-ee-disrepancies-in-js' into 'master'Filipa Lacerda2018-02-2222-45/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Harmonize CE and EE JS code See merge request gitlab-org/gitlab-ce!17264
| * | | | | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-2222-44/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Fix the groupLabelsPath in app/assets/javascripts/api.jsRémy Coutable2018-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '42332-actionview-template-error-366-524-out-of-range' into ↵Douwe Maan2018-02-223-1/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "ActionView::Template::Error: 366..524 out of range" Closes #42332 See merge request gitlab-org/gitlab-ce!17262
| * | | | | | Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-223-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rugged sometimes chops a context line in between bytes, resulting in the context line having an invalid encoding: https://github.com/libgit2/rugged/issues/716 When that happens, we will try to detect the encoding for the diff, and sometimes we'll get it wrong. If that difference in encoding results in a difference in string lengths between the diff and the underlying blobs, we'd fail to highlight any inline diffs, and return a 500 status to the user. As we're using the underlying blobs, the encoding is 'correct' anyway, so if the string range is invalid, we can just discard the inline diff highlighting. We still report to Sentry to ensure that we can investigate further in future.
* | | | | | | Merge branch '43495-spec-failure-spec-features-users_spec-rb' into 'master'Sean McGivern2018-02-228-247/+194
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Spec failure: spec/features/users_spec.rb" Closes #43495 See merge request gitlab-org/gitlab-ce!17289
| * | | | | | | Fix user feature specs that were hardcoding 'user1'43495-spec-failure-spec-features-users_spec-rbRémy Coutable2018-02-228-247/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'webpack-autoinclude' into 'master'Jacob Schatz2018-02-221-6/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Backport of Webpack auto include for EE imports See merge request gitlab-org/gitlab-ce!17282
| * | | | | | | Backport of Webpack auto include for EE importsClement Ho2018-02-221-6/+8
|/ / / / / / /
* | | | | | | Merge branch 'fix-squash-with-renamed-files' into 'master'Grzegorz Bizon2018-02-223-5/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix squash with renamed files Closes gitlab-ee#4975 See merge request gitlab-org/gitlab-ce!17216
| * | | | | | | Fix squash with renamed filesfix-squash-with-renamed-filesSean McGivern2018-02-193-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to ignore the names for renamed files when configuring with sparse checkout.
* | | | | | | | Merge branch 'zj-branch-contains-git-message' into 'master'Douwe Maan2018-02-223-10/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow branchnames to be named the same as the commit it points to See merge request gitlab-org/gitlab-ce!17231
| * | | | | | | | Handle branch and tag names which are commit idsZeger-Jan van de Weg2018-02-213-10/+48
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a test where a branch name is also a valid commit id. Git, the binary should create an error message which is difficult to parse and leading to errors later, as seen in: gitlab-org/gitlab-ce#43222 To catch these cases in the future, gitlab-test@1942eed5cc108b19c7405106e81fa96125d0be22 was created. Which a branch name matching the commit
* | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-221-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format markdown.md to comply with what it describes. See merge request gitlab-org/gitlab-ce!17284
| * | | | | | | | Format markdown.md to comply with what it describes.Ulf Rompe2018-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the text says "here are two spaces to force a line break" there really should be two spaces to force a line break.
* | | | | | | | | Update VERSION to 10.6.0-prev10.6.0.preMark Fletcher2018-02-221-1/+1
| | | | | | | | |
* | | | | | | | | Update CHANGELOG.md for 10.5.0Mark Fletcher2018-02-22160-804/+192
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'jramsay-detailed-proofreader-process-docs' into 'master'Douwe Maan2018-02-221-3/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more detail to the proofreader process See merge request gitlab-org/gitlab-ce!17279
| * | | | | | | | No `../` is necessary for linking pages in the same directory.jramsay-detailed-proofreader-process-docsConnor Shea2018-02-211-1/+1
| | | | | | | | |
| * | | | | | | | Link directly to proofreader.mdJames Ramsay2018-02-211-2/+4
| | | | | | | | |
| * | | | | | | | Add more detail to the proofreader processJames Ramsay2018-02-211-3/+20
| | | | | | | | |
* | | | | | | | | Merge branch ↵Filipa Lacerda2018-02-226-152/+100
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation' into 'master' Resolve "Followup to New design for cancel/stop pipeline confirmation" Closes #42886 See merge request gitlab-org/gitlab-ce!17106
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ↵42886-followup-to-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-21413-6913/+5810
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
| * | | | | | | | | Merge branch 'master' into ↵Shah El-Rahman2018-02-1613-55/+27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
View Lorry Controller Status