delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'issue_41021' into 'master'10-3-stable-prepare-rc1	Sean McGivern	2017-12-13	8	-8/+62
\| \| \| \| \| \| \| \|	Prevent worker that updates merge requests head pipeline from failing jobs Closes #41021 See merge request gitlab-org/gitlab-ce!15870
*	Revert "Merge branch 'zj-memoization-mr-commits' into 'master'"	Oswaldo Ferreira	2017-12-13	7	-57/+13
\| \| \| \|	This reverts commit 54f008126d83af1869572565336e01d3953b2b91.
*	Fix merge_request.rb conflict resolution	LUKE BENNETT	2017-12-13	1	-1/+0
\|
*	Fix wrong conflict resolution on !15858	Oswaldo Ferreira	2017-12-13	1	-2/+1
\|
*	Merge branch '10-3-stable-prepare-rc1' of ↵	Luke Bennett	2017-12-13	25	-1162/+610
\|\ \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 10-3-stable-prepare-rc1
\| *	Merge branch 'tm/docs/docker-extended-entrypoint-fix' into 'master'	Achilleas Pipinellis	2017-12-13	1	-22/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Merge branch 'winh-merge-dev-docs' into 'master'	Winnie Hellmann	2017-12-13	1	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve merge conflicts with dev.gitlab.org/master after security release See merge request gitlab-org/gitlab-ce!15851 (cherry picked from commit d9f40fddb704a60a38a95dd6433ff40ce65d738d) 4f992572 Update CHANGELOG.md for 10.2.4 84b3c215 Update CHANGELOG.md for 10.1.5 fad2a07c Update CHANGELOG.md for 10.0.7 10131bf2 Merge remote-tracking branch 'gitlab-ce/master' d9453a24 Merge dev.gitlab.org/master into winh-merge-dev be586388 Make CHANGELOG.md consistent for 10.2.4, 10.1.5, and 10.0.7
\| *	Merge branch 'update-dependencies-license-list' into 'master'	LUKE BENNETT	2017-12-13	1	-1070/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates dependencies license list See merge request gitlab-org/gitlab-ce!15905 (cherry picked from commit 097b06784432b22844b85ed7c4af5d750ce306aa) f7e084c0 Updates dependencies license list
\| *	Merge branch '10-3-gitignore' into 'master'	Tiago	2017-12-13	18	-63/+150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	10.3 gitignore and license templates Closes #10 See merge request gitlab-org/gitlab-ce!15901 (cherry picked from commit 98eda47a52cab6fd250d25bb24d2457e43fa92d1) f87f4250 Ran bin/rake gitlab:update_templates
\| *	Merge branch '10-3-update-guide' into 'master'	Tiago	2017-12-13	1	-0/+360
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	10.3 update guide Closes #10 See merge request gitlab-org/gitlab-ce!15900 (cherry picked from commit 81e9aaead064a6a1e6caabdc3914c5d948b54b61) ce46d125 Add 10.2-to-10.3.md
\| *	Merge branch '10-3-installation-from-source' into 'master'	Tiago	2017-12-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	10.3 "Installation from Source" Closes #10 See merge request gitlab-org/gitlab-ce!15899 (cherry picked from commit 10b5f91666b6d76ab878a6d31d187c55903a7ecf) c004ca0f Update name of the stable branch in Clone the Source
\| *	Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' ↵	Tim Zallmann	2017-12-13	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Prometheus loading screen no longer seems to appear" Closes #40285 See merge request gitlab-org/gitlab-ce!15889 (cherry picked from commit a8b9852837c3ecde3148a7e989d53fd5ac025bc3) d072c0cd fix broken empty state assets for environment monitoring page 9864720a add CHANGELOG.md entry for !15889
* \|	Merge branch 'zj-memoization-mr-commits' into 'master'	Sean McGivern	2017-12-13	7	-13/+58
\|/ \| \| \| \| \|	Use memoization for commits on diffs See merge request gitlab-org/gitlab-ce!15857
*	Merge branch 'fix-remove-branch-name-migration' into 'master'	Sean McGivern	2017-12-13	2	-0/+4
\| \| \| \| \| \|	Fix migration that removes issues.branch_name See merge request gitlab-org/gitlab-ce!15858
*	Merge branch 'mk-fix-leaky-spec' into 'master'	Stan Hu	2017-12-13	1	-4/+13
\| \| \| \| \| \| \| \| \|	CE Backport - Fix order-dependent spec failure by avoiding monkeypatching See merge request gitlab-org/gitlab-ce!15893 (cherry picked from commit 31fa9313991881258b4697cb507cfc8ab205b7dc) acde0e3f Fix spec by avoiding monkeypatching
*	Merge branch 'gitaly-mirroring-prep' into 'master'	Robert Speicher	2017-12-13	4	-55/+46
\| \| \| \| \| \| \| \| \| \| \| \|	Gitaly mirroring migration prep Closes gitaly#816 See merge request gitlab-org/gitlab-ce!15775 (cherry picked from commit 6930fa3102f0ba197e969f9996e86bf11346470c) 885a4da2 Add feature flag to use gitaly-ssh mirroring when cloning internal repos 95009cef Unify mirror addition operations to prepare for Gitaly migration
*	Merge branch 'optimize-projects-for-imported-projects' into 'master'	Yorick Peterse	2017-12-13	2	-1/+8
\| \| \| \| \| \| \| \| \|	check the import_status field before doing SQL operations to check the import url See merge request gitlab-org/gitlab-ce!15752 (cherry picked from commit 49a9de110e4d2a70d006759529822b3823b63f96) 946d87d3 check the import_status field before doing SQL operations to check the import url
*	Merge branch 'jprovazn-description' into 'master'	Sean McGivern	2017-12-13	5	-2/+37
\| \| \| \| \| \| \| \| \| \| \|	Use message body for merge request description Closes #40968 See merge request gitlab-org/gitlab-ce!15839 (cherry picked from commit 52d9ee6299a55fc3362a47207e3d62fba1dfbdd1) b39b5524 Use message body for merge request description
*	Merge branch 'dm-image-blob-diff-full-url' into 'master'	Sean McGivern	2017-12-13	6	-21/+39
\| \| \| \| \| \| \| \| \| \| \|	Use app host instead of asset host when rendering image blob or diff Closes #41002 See merge request gitlab-org/gitlab-ce!15854 (cherry picked from commit 6b83f0d07c59b33e41530704eb09ce39b3f987b6) e8d0d6ba Use app host instead of asset host when rendering image blob or diff
*	Merge branch 'diff-file-navigation-doc-screenshot-docs' into 'master'	Filipa Lacerda	2017-12-13	1	-0/+0
\| \| \| \| \| \| \| \| \|	Updated image for diff navigation docs See merge request gitlab-org/gitlab-ce!15875 (cherry picked from commit d8722e8064a9691e7ad076b6265912ff4f4adf0a) d66e9370 Updated image for diff navigation docs
*	Merge branch ↵	Douwe Maan	2017-12-13	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|	'41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cache' into 'master' Resolve "undefined method `new_project_guidelines_html', unable to load from cache" Closes #41041 See merge request gitlab-org/gitlab-ce!15878 (cherry picked from commit 2750d7e6606e91f608b9e379980e24f3a632cc5a) 3b860069 Clears the current Appearance cache otherwise it breaks since…
*	Merge branch ↵	Kamil Trzciński	2017-12-13	2	-8/+22
\| \| \| \| \| \| \| \| \| \| \| \| \|	'41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build' into 'master' Job dropping by MissingDependenciesError should consider StaleObjectError Closes #41023 See merge request gitlab-org/gitlab-ce!15873 (cherry picked from commit 6fff0473e0cf13607fdd49f856821680298113d8) 3494cdfe ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build
*	Merge branch 'fix-image-view-mode' into 'master'	Filipa Lacerda	2017-12-13	2	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Fix image view mode Closes #40945 See merge request gitlab-org/gitlab-ce!15803 (cherry picked from commit fb47f2a7459f4c413f3fe496bcdb1b40d81d73a4) e815e8eb Fix image view mode aa2031b6 Add spec
*	Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master'	Stan Hu	2017-12-13	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \|	Ignore temporary table in schema Closes #40976 See merge request gitlab-org/gitlab-ce!15866 (cherry picked from commit 9e9d33134632618b135dc7f6f6e3f0d3d8ab5cdd) 61267ca9 Ignore temporary table in schema
*	Merge branch 'backport-epic-in-issue' into 'master'	Jacob Schatz	2017-12-13	11	-82/+151
\| \| \| \| \| \| \| \| \|	Backport epic in issue See merge request gitlab-org/gitlab-ce!15799 (cherry picked from commit 9c6ce2e8c93dc8d75d00b67ec5628f542826e5b8) bd7218f2 Backport epic in issue
*	Merge branch '35724-animate-sidebar' into 'master'	Filipa Lacerda	2017-12-13	12	-33/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797 (cherry picked from commit 2d00ad4868c21aef068232a79495f85e8f50d59b) 37f0ee04 Animate contextual sidebar; change class names for easier readability a1d5d49a Add changelog ee85ca73 Fix mobile styles e0172564 Fix transitions
*	Merge branch 'sh-bump-prometheus-gem-properly' into 'master'	Robert Speicher	2017-12-13	2	-2/+2
\| \| \| \| \| \| \| \| \|	Properly bump prometheus-client-mmap gem versions See merge request gitlab-org/gitlab-ce!15825 (cherry picked from commit a2d1648076cf55b09562f7ef081fd9e479398ab6) 938cc162 Properly bump prometheus-client-mmap gem versions
*	Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'	Yorick Peterse	2017-12-13	5	-97/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Remove allocation tracking code from InfluxDB sampler for performance Closes gitlab-com/infrastructure#3250 See merge request gitlab-org/gitlab-ce!15834 (cherry picked from commit 3daa7331397d0b565911d5bb67b2411b021136fa) e1a8e5a5 Remove allocation tracking code from InfluxDB sampler for performance 10f5446c Remove RubySampler#sample_objects for performance as well
*	Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'	Winnie Hellmann	2017-12-13	14	-46/+231
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821 (cherry picked from commit 1eff1bd385a28ccde7d0dc3a991c499ada1a63bd) d332c8c7 Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into 'security-10-2' 8c0aa7d4 Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2' 8f29d264 Merge branch 'rs-security-group-api' into 'security-10-2' c59ae547 Merge branch 'issue_30663' into 'security-10-2' f4fbe61a Merge branch 'note-preview' into 'security-10-2' 0f811675 Manually add 10.2.4 changelog entries f71e48a0 Resolve conflicts in app/models/user.rb
*	Merge branch 'bvl-circuitbreaker-metrics' into 'master'	Douwe Maan	2017-12-13	2	-2/+25
\| \| \| \| \| \| \| \| \| \| \|	Keep track of the circuit breaker access check timings Closes #39698 See merge request gitlab-org/gitlab-ce!15612 (cherry picked from commit 13ac8e5706f76f2e8d92ca85145cae13cf112a07) d4d06bde Keep track of storage check timings
*	Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master'	Grzegorz Bizon	2017-12-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	Do not raise when downstream pipeline is created Closes #40987 See merge request gitlab-org/gitlab-ce!15837 (cherry picked from commit 95daf62bef31f28525cd044716d4b336decdd97a) 90569a17 Do not raise when downstream pipeline is created
*	Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'	Sean McGivern	2017-12-13	1	-2/+8
\| \| \| \| \| \| \| \| \|	Add recaptcha_check_if_spammable for issualbes than arent spammables See merge request gitlab-org/gitlab-ce!15817 (cherry picked from commit 689bc9ea6db102006b548e6176125157955c7f2b) 0e935c76 Add recaptcha_check_if_spammable for issualbes than arent spammables
*	Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'	Douwe Maan	2017-12-13	16	-111/+367
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid pipeline build chain tag evaluation Closes #40944 See merge request gitlab-org/gitlab-ce!15805 (cherry picked from commit 103269b9a6d92ff3d4d0f3b69e4653e3f0ef7744) b30e0e06 Fix invalid pipeline build chain tag evaluation ad3be46b Implement and use Gitlab::Ci::Pipeline::Chain::Command 865341ac Fix a bug of before_sha being inproperly evaluated to `checkout_sha` b5f6a5f9 Add Chain::Command specs 99101f94 Fix Rubocop
*	Merge branch 'sh-fix-import-rake-task' into 'master'	James Lopez	2017-12-13	5	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab:import:repos Rake task moving repositories into the wrong location Closes #40765 See merge request gitlab-org/gitlab-ce!15823 (cherry picked from commit 7694ae887885c66eb633d3f78eac3128a08dc978) 78f7c3c8 Fix gitlab:import:repos Rake task moving repositories into the wrong location e8cced80 Fix failing importer test case on MySQL due to missing trailing slash in root path 917a112e Simplify normalizing of paths 86661a3a Use build instead of create in importer spec f1eaab7b Remove the need for destroy and add a comment in the spec
*	Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'	Mike Greiling	2017-12-13	12	-38/+199
\| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Deploy markers should be more verbose" Closes #38032 See merge request gitlab-org/gitlab-ce!15641 (cherry picked from commit 8730054683c00f4c79cf452beef0df794c70bf6b) d377aa54 Changed the deploy markers on the prometheus dashboard to be more verbose 3642f6f0 Reduce the size of the deploy flag when there's no tag available
*	Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'	Douwe Maan	2017-12-13	20	-52/+510
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow git pull/push on project redirects Closes #35385 See merge request gitlab-org/gitlab-ce!15670 (cherry picked from commit 2a181d68c810e89ff5d2e49999775d8b58adb394) 37c99562 Allow git pull/push on project redirects 64811239 Allow group/username transfers: 4344bba4 Fixes wrong condition on git access b6bac528 Wrap ProjectMoved behavior into a class 70676e3b Fixes permanent migration 3328950e Moves allowed_path_validation up to Namespace 54900c4a Addreses ME review comments 740ed1e0 Add several improvements 6a0d9261 Add fixes based on MR suggestions 8a1a257b Ensures validations are only executed if RedirectRoute#permanent column exists 448f1c54 Fixes broken specs and suggestions on MR da789af6 Add fixes based on MR comments 2bd96f5f Bump GITLAB_SHELL_VERSION to 5.10.2 75981dc4 Ensure RedirectRoute column information is flushed
*	Merge branch 'fix-event-target-author-preloading' into 'master'	Douwe Maan	2017-12-13	2	-1/+6
\| \| \| \| \| \| \| \| \|	Fix N+1 query when displaying events See merge request gitlab-org/gitlab-ce!15788 (cherry picked from commit 53026c4282f41397e984009545fbec8f77a8fc8a) c52a36e8 Fix N+1 query when displaying events
*	Merge branch ↵	Sean McGivern	2017-12-13	16	-68/+363
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29483-no-feedback-when-checking-on-checklist-if-potential-spam-was-detected' into 'master' Resolve "No feedback when checking on checklist if potential spam was detected" Closes #29483 See merge request gitlab-org/gitlab-ce!15408 (cherry picked from commit d32032de08585476c3b303803a307ff94d910ebd) efc86c26 Mock spam? 8e9a9030 Merge remote-tracking branch 'origin/master' into… 019db0fd TEMP mock askismet spam check 11e51be6 respond_to json with json version of verify view in recaptcha_check_with_fallback 18955cdc Differentiate between spam related error and other update errors 9dcf093c Start recaptcha modal and render partial instead 64b13133 Append and remove api script when reCAPTCHA is needed c9a67fab put-over-post the recaptcha form cb22ae66 remove comments 20517d64 remove comments e174d02e Review changes 7a7d4a2a Add spec 8f617b45 Added changelog db3f1a47 Review changes 4d0c78de Add to tasklist 36ea921b Remove duplicate TaskList 6bffe620 Add app_spec for spam d95350bc Finished specs cf951cba FOR REVIEWERS 6c50e850 FOR MERGE 25931f73 Allow script src to be mockable c3463e00 Merge remote-tracking branch 'origin/master' into… 2c170b8d fix eslint a318c757 Fix redirect 8a02fbd0 BE review changes dda03f4d Fix spec 910c7205 Fix spec fafbd7e5 remove duplicate destroy
*	Revert "Merge branch 'throttle-touching-of-objects' into 'master'"	Oswaldo Ferreira	2017-12-12	10	-82/+3
\| \| \| \| \|	This reverts commit 102b32325da3fc93a1c99d05b20c853fc681df35, reversing changes made to d87d1e7901f7a71c6f0541c709be26fce3db7e4b.
*	Merge branch 'bvl-circuitbreaker-process' into 'master'	Douwe Maan	2017-12-08	45	-362/+983
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Check NFS mounts in a separate process Closes #39847 See merge request gitlab-org/gitlab-ce!15426
\| *	Move the circuitbreaker check out in a separate processbvl-circuitbreaker-process	Bob Van Landuyt	2017-12-08	45	-362/+983
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
*	Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'	Grzegorz Bizon	2017-12-08	4	-5/+52
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix new personal access token showing up in a flash message Closes #40754 See merge request gitlab-org/gitlab-ce!15707
\| *	Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-token	Eric Eastwood	2017-12-07	4	-5/+52
\| \|
* \|	Merge branch 'jprovazn-testfix2' into 'master'	Stan Hu	2017-12-08	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean test path between merge request handler tests Closes #40900 See merge request gitlab-org/gitlab-ce!15792
\| * \|	Clean test path between merge request handler testsjprovazn-testfix2	Jan Provaznik	2017-12-07	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	create_merge_request_handler_spec needs a repository for some tests but this repository lasts on disk by default which causes failures of other tests. TestEnv.clean_test_path is used to get rid of the repository after each test. Closes #40900
* \| \|	Merge branch 'gitaly-795-migrate-repository-fsck' into 'master'	Robert Speicher	2017-12-08	2	-2/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Git::Repository#fsck to Gitaly Closes gitaly#795 See merge request gitlab-org/gitlab-ce!15731
\| * \| \|	Migrate Git::Repository#fsck to Gitaly	Kim Carlbäcker	2017-12-08	2	-2/+27
\|/ / /
* \| \|	Merge branch '40825-use-relative-path-urls' into 'master'	Robert Speicher	2017-12-07	11	-14/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative _path helper URLs in the GitLab UI Closes #40825 See merge request gitlab-org/gitlab-ce!15738
\| * \| \|	Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urls	Eric Eastwood	2017-12-07	11	-14/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* \| \| \|	Merge branch ↵	Jacob Schatz	2017-12-07	2	-2/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' Replace absolute URLs on related branches/MRs with relative url to avoid hostname Closes #40555 See merge request gitlab-org/gitlab-ce!15735