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
AgeCommit message (Collapse)Author
2017-12-22Update VERSION to 10.3.0v10.3.0Tiago Botelho
2017-12-22Update CHANGELOG.md for 10.3.0Tiago Botelho
[ci skip]
2017-12-22Update VERSION to 10.3.0-rc5v10.3.0-rc5Tiago Botelho
2017-12-21Merge branch 'diff-worker-js-fix' into 'master'Jacob Schatz
Fixed diff_worker not compiling correctly Closes #41182 See merge request gitlab-org/gitlab-ce!15966 (cherry picked from commit baa6438b966a3f96041c8069a81836a7cd1e9a65) df4fe43d Fixed diff_worker not compiling correctly a69e7aff changed webpack config
2017-12-21Merge branch 'zj-empty-repo-importer' into 'master'Stan Hu
Migrate to Project#empty_repo? Closes #41326 See merge request gitlab-org/gitlab-ce!16054 (cherry picked from commit e0a27ee419b55509204ba2bfbdbfbab3c7c331bc) 338f1eaf Migrate to Project#empty_repo?
2017-12-21Merge branch 'remove-changelog-entry-for-15788' into '10-3-stable'Oswaldo Ferreira
Removes changelog entry for !15788 See merge request gitlab-org/gitlab-ce!16091
2017-12-21Removes changelog entry for !15788Tiago Botelho
2017-12-21Merge branch 'revert-n-plus-1-fix-in-events' into '10-3-stable'Tiago
Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 See merge request gitlab-org/gitlab-ce!16088
2017-12-21Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788Francisco Javier López
2017-12-21Merge branch 'bvl-patch-mr-serializer-stable-ce' into '10-3-stable'Oswaldo Ferreira
CE: Fall back to the `MergeRequestWidgetEntity` See merge request gitlab-org/gitlab-ce!16077
2017-12-21Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt
When no serializer was passed.
2017-12-20Update VERSION to 10.3.0-rc4v10.3.0-rc4Tiago Botelho
2017-12-20Merge branch '10-3-stable-prepare-rc3' into '10-3-stable'Tiago
Prepare 10.3 RC4 release (initially planned to be RC3) See merge request gitlab-org/gitlab-ce!16000
2017-12-20Merge branch 'gitaly-0.59.2' into '10-3-stable'Robert Speicher
Use Gitaly 0.59.2 in 10-3-stable [ci skip] See merge request gitlab-org/gitlab-ce!16039
2017-12-20Use Gitaly 0.59.2Jacob Vosmaer
2017-12-20Update VERSION to 10.3.0-rc3v10.3.0-rc3Oswaldo Ferreira
2017-12-20Merge branch 'ce-remove-migration-add-timezone-to-issues-closed-at' into ↵Stan Hu
'10-3-stable' Removes AddTimezoneToIssuesClosedAt migration and respective cleanup post migration for C See merge request gitlab-org/gitlab-ce!16021
2017-12-19Removes AddTimezoneToIssuesClosedAt migration and respective cleanup post ↵Tiago Botelho
migration for C
2017-12-19Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern
Clear caches before updating MR diffs See merge request gitlab-org/gitlab-ce!15916
2017-12-19Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern
Use memoization for commits on diffs See merge request gitlab-org/gitlab-ce!15857
2017-12-19Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'⛄️ Sean McGivern ⛄️
fix the commit diff discussion sending the wrong url See merge request gitlab-org/gitlab-ce!15988 (cherry picked from commit f7a9ced235be7ef13f90b561d23ffe602e11e9a3) c77083a4 fix the commit diff discussion sending the wrong url a794b161 rework the merge_request_version_params to use Object#tap
2017-12-19Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern
Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847 (cherry picked from commit 3870a1bde276144a05a31185ede7a5032818d489) cba40a1f Stop sending milestone and labels data over the wire for MR widget
2017-12-19Merge branch 'skip-sast-on-ce' into 'master'Kamil Trzciński
Avoid running autodevops sast job on GitLab CE Closes gl-sast#3 See merge request gitlab-org/gitlab-ce!15962 (cherry picked from commit 169a8c35847a925597ed1abb9225c722fc9ed8ee) 8153f734 Avoid running autodevops sast job on GitLab CE
2017-12-19Merge branch 'qa/rs-filter-by-name-subgroup' into 'master'Grzegorz Bizon
Filter by subgroup name before determining if our group has a subgroup See merge request gitlab-org/gitlab-ce!15969 (cherry picked from commit 306967478734418ec0fc5f011204464b961cc409) 643dca1c Filter by subgroup name before determining if our group has a subgroup
2017-12-19Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ↵Nick Thomas
'master' Don't use Markdown cache for stubbed settings in specs Closes #41130 See merge request gitlab-org/gitlab-ce!15954 (cherry picked from commit dc17e7d7a9a6a246cd8c69a7d06ff1dcfefd8384) 10885edf Don't use Markdown cache for stubbed settings in specs
2017-12-19Merge branch 'docs/sast' into 'master'Dmitriy Zaporozhets
Add SAST docs Closes gitlab-ee#4125 See merge request gitlab-org/gitlab-ce!15859 (cherry picked from commit 0b19319be6846f6de1c3bb351ae82bc5218227c2) a862a21f Add SAST docs
2017-12-19Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern
Make sure user email is read only when synced with LDAP Closes #41033 See merge request gitlab-org/gitlab-ce!15915 (cherry picked from commit d39d968ba4100be3e77e9d02af6ce10ff18ca508) 481b8a71 Make sure user email is read only when synced with LDAP
2017-12-19Merge branch 'docs-add-auto-pipeline' into 'master'Achilleas Pipinellis
Add note about automatic pipelines when enabling Auto DevOps See merge request gitlab-org/gitlab-ce!15946 (cherry picked from commit 6547f54963f3cf069872517c8d0cbd9ed6be01cf) 8de4cb57 Add note about automatic pipelines when enabling Auto DevOps bfa4fa91 Move note on automatic pipelines further below
2017-12-19Merge branch 'docs-update-documentation-guidelines' into 'master'🚄 Job van der Voort 🚀
Docs update documentation guidelines See merge request gitlab-org/gitlab-ce!15811
2017-12-19Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master'Achilleas Pipinellis
Add commit diff discussion in merge request context documentation See merge request gitlab-org/gitlab-ce!15885 (cherry picked from commit 8b33670e3144164637b22919ea58a69cea5dc38a) 2cf80d11 Add docs for commit diff discussion in merge requests
2017-12-19Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern
Clear caches before updating MR diffs See merge request gitlab-org/gitlab-ce!15916
2017-12-19Merge branch 'docs-jprovazn-create-from-email' into 'master'Marcia Ramos
Fixed doc for create MR from email See merge request gitlab-org/gitlab-ce!15849 (cherry picked from commit 391bb437611b91e2767384ff9852beb573c84996) e297c417 Fixed doc for create MR from email
2017-12-19Merge branch 'dm-batchloader-project' into 'master'Sean McGivern
Include project in BatchLoader key to prevent returning blobs for the wrong project Closes gitlab-ee#4325 See merge request gitlab-org/gitlab-ce!15936 (cherry picked from commit f51141878171c1162818f8fa0133125a5e92d3eb) 6c4f6d37 Include project in BatchLoader key to prevent returning blobs for the wrong project f871027e Clear BatchLoader after each spec to prevent holding onto records longer than necessary
2017-12-19Merge branch 'update-doc-for-user-group-project-transfers' into 'master'Douwe Maan
Clarifies documentation for user, group & project transfers See merge request gitlab-org/gitlab-ce!15896 (cherry picked from commit af110b89971752bb25c59f4853dd8633fda1ed1e) 1bdbff2d Updates doc for user, group & project transfers
2017-12-19Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into ↵Robert Speicher
'master' Cache feature check for 1 minute for MethodCall instrumentation toggle See merge request gitlab-org/gitlab-ce!15800 (cherry picked from commit 83998c0a33c70c786f48eef5ce723eb6dd76761f) 53dc9e83 Cache feature check for 5 minutes for MethodCall instrumentation toggle b503e6ff Implement simple in memory cache that expires after 5 minutes 6af84964 Set cache expire only once the cache is filled, 5904b033 Implemente measurement enabled cache using AtomicReference 408208bc Use AtomicFixNum to implement CAS isolated cache update. ca176a9b move call_measurement_enabled? method to the bottom of the file fd0a5168 use class variables instead of CONSTANTs da19ce62 Expire feature flag cache after 1minute 51668d3e Use class variable and add rubocop exception db9e5bf7 fix test case description
2017-12-19Merge branch 'fix-throttled-update-for-10-3' into '10-3-stable'Oswaldo Ferreira
Restore throttling of touch for 10.3 stable See merge request gitlab-org/gitlab-ce!15890
2017-12-19Update VERSION to 10.3.0-rc2v10.3.0-rc2James Lopez
2017-12-19Merge branch 'sh-fix-milestone-id-migration' into 'master'Oswaldo Ferreira
Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key migration Closes gitlab-com/infrastructure#3416 See merge request gitlab-org/gitlab-ce!15997
2017-12-14Update VERSION to 10.3.0-rc1v10.3.0-rc1Tiago Botelho
2017-12-14Return the noteable in Note#touch_noteableYorick Peterse
This allows EE to re-use the object, making it easier to trigger indexing of the noteable.
2017-12-14Restore throttling of touchYorick Peterse
2017-12-14Merge branch ↵Kamil Trzciński
'41110-dependencies-validator-fails-when-depended-job-is-manual' into 'master' Dependencies Validator fails when depended job is `manual` Closes #41110 See merge request gitlab-org/gitlab-ce!15924 (cherry picked from commit 57175ecb5060dac145abc048b6e88642bc1aa82b) 1def948b Dependencies Validator fails when depended job is `manual`
2017-12-14Merge branch '10-3-stable-prepare-rc1' into '10-3-stable'James Lopez
Prepare 10.3 RC1 release See merge request gitlab-org/gitlab-ce!15907
2017-12-13Merge branch 'issue_41021' into 'master'Sean McGivern
Prevent worker that updates merge requests head pipeline from failing jobs Closes #41021 See merge request gitlab-org/gitlab-ce!15870
2017-12-13Revert "Merge branch 'zj-memoization-mr-commits' into 'master'"Oswaldo Ferreira
This reverts commit 54f008126d83af1869572565336e01d3953b2b91.
2017-12-13Fix merge_request.rb conflict resolutionLUKE BENNETT
2017-12-13Fix wrong conflict resolution on !15858Oswaldo Ferreira
2017-12-13Merge branch '10-3-stable-prepare-rc1' of ↵Luke Bennett
https://gitlab.com/gitlab-org/gitlab-ce into 10-3-stable-prepare-rc1
2017-12-13Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern
Use memoization for commits on diffs See merge request gitlab-org/gitlab-ce!15857
2017-12-13Merge branch 'tm/docs/docker-extended-entrypoint-fix' into 'master'Achilleas Pipinellis
Fix entrypoint overriding documentation See merge request gitlab-org/gitlab-ce!15884 (cherry picked from commit a2c615d16948301f91d704acd7386d2c0efb5ccd) b17c3ab6 Fix entrypoint overriding documentation 9f3df649 Refactor entrypoint override docs