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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Properly set the expectation on the main object36003-do-not-include-to-kernel	Lin Jen-Shin	2017-08-09	3	-19/+23
\|
*	We shouldn't include utility methods everywhere	Lin Jen-Shin	2017-08-08	2	-1/+4
\|
*	Just extend main, rather than include to Kernel	Lin Jen-Shin	2017-08-08	2	-13/+1
\| \| \| \| \| \| \|	Unfortunately rake doesn't have nested context, everything just runs on a main rake object. This is probably due to compatibility issue, but anyway, we could just extend the object.
*	Merge branch '35098-raise-encoding-confidence-threshold' into 'master'	Sean McGivern	2017-08-08	5	-1/+102
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Raise encoding confidence threshold to 50 Closes #35098 See merge request !12990
\| *	Make sure that we have author and committer	Lin Jen-Shin	2017-08-08	1	-0/+3
\| \| \| \| \| \| \| \|	In case we don't have it setup in ~/.gitconfig
\| *	Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-threshold	Lin Jen-Shin	2017-08-08	3	-0/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we set `ENCODING_CONFIDENCE_THRESHOLD` to 40, this test case would not pass. If we raise to 50, this would pass. Note that if in the future rugged didn't return corrupt data, this would be less relevant. But still icu recommend the threshold to be 50, we should just stick with 50.
\| *	Add changelog entry	Lin Jen-Shin	2017-08-08	1	-0/+4
\| \|
\| *	Raise encoding confidence threshold to 50	Lin Jen-Shin	2017-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is recommended that we set this to 50: https://gitlab.com/gitlab-org/gitlab-ce/issues/35098#note_35036746 In this particular issue, the confidence was 42 for Shift JIS, but in fact that's encoded in UTF-8 just with a single bad character. In this case, we shouldn't try to treat it as Shift JIS, but just treat it as UTF-8 and remove invalid bytes. Treating it like Shift JIS would corrupt the whole data. Unfortunately, the diff which would cause this could not be disclosed therefore we can't use it as a test example.
* \|	Merge branch 'rc/fix-commits-api' into 'master'	Sean McGivern	2017-08-08	10	-173/+592
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370
\| * \|	Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-api	Rémy Coutable	2017-08-08	10	-173/+592
\| \|/ \| \| \| \| \| \| \| \| \| \|	name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'project-homepage-activity' into 'master'	Tim Zallmann	2017-08-08	2	-0/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed activity not loading on project homepage See merge request !13373
\| * \|	Fixed activity not loading on project homepageproject-homepage-activity	Phil Hughes	2017-08-08	2	-0/+16
\| \| \|
* \| \|	Merge branch '35136-barchart-not-display-label-at-0-hour' into 'master'	Clement Ho	2017-08-08	3	-21/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bar chart does not display label at hour 0 Closes #35136 See merge request !13330
\| * \| \|	Fix bar chart does not display label at hour 0	Jason Dai	2017-08-08	3	-21/+23
\|/ / /
* \| \|	Merge branch 'winh-scope-haml-linter' into 'master'	Grzegorz Bizon	2017-08-08	1	-9/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict InlineJavaScript for haml_lint to dev and test environment Closes omnibus-gitlab#2658 See merge request !13364
\| * \| \|	Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linter	winh	2017-08-08	1	-9/+11
\| \| \| \|
* \| \| \|	Merge branch 'project_events_noteable_iid' into 'master'	Rémy Coutable	2017-08-08	5	-3/+90
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose noteable_iid in Note See merge request !13265
\| * \| \| \|	Expose noteable_iid in Note	sue445	2017-08-08	5	-3/+90
\|/ / / /
* \| \| \|	Merge branch 'rc/fix-tags-api' into 'master'	Sean McGivern	2017-08-08	9	-184/+388
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name… See merge request !13368
\| * \| \|	Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵	Rémy Coutable	2017-08-08	9	-184/+388
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into ↵	Rémy Coutable	2017-08-08	3	-18/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Unset the `RUBYOPT` env variable before installing `gitaly-ruby` Closes #35941 and #35967 See merge request !13313
\| * \| \|	Print the setup steps and duration and fix an issue resulting in re-setuping ↵35941-fix-testing-issue-following-gitaly-install-fix	Rémy Coutable	2017-08-04	3	-9/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Shell on each test run Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Unset the RUBYOPT env variable before installing gitaly-ruby	Rémy Coutable	2017-08-04	3	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Revert "Merge branch 'fix-gitaly-install' into 'master'"	Rémy Coutable	2017-08-04	3	-17/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 23c502b43404aa70741462da5d57c23196f6088a, reversing changes made to 1018ab0516fd94d1ffbc05a0ad8499947dd9630d.
* \| \| \|	Merge branch '35002_add_italian_translations_of_pipeline_schedules' into ↵	Rémy Coutable	2017-08-08	1	-3/+27
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add Italian translations of Pipeline Schedules Closes #35002 See merge request !12981
\| * \| \|	Add Italian translations of Pipeline Schedules	Huang Tao	2017-08-08	1	-3/+27
\|/ / /
* \| \|	Merge branch 'document-and-test-api-iids' into 'master'	Rémy Coutable	2017-08-08	4	-8/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the iids parameters in the API documentation See merge request !13340
\| * \| \|	Fix the iids parameters in the API documentation	Frank Pavageau	2017-08-07	4	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the parameter name is really `iids[]`, it should be used consistently across the documentation.
* \| \| \|	Merge branch 'ide' into 'master'	Mike Greiling	2017-08-08	101	-239/+3706
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Multi-File Editor Using Monaco/VSCode Closes #31890 See merge request !12198
\| * \ \ \	Merge branch 'master' into ide	Mike Greiling	2017-08-07	204	-4690/+3960
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
* \| \| \| \|	Merge branch '24685_view_self' into 'master'	Jacob Schatz	2017-08-08	6	-22/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show all labels See merge request !13303
\| * \| \| \| \|	Show all labels	Regis Boudinot	2017-08-08	6	-22/+35
\|/ / / / /
* \| \| \| \|	Merge branch '31207-clean-locked-merge-requests' into 'master'	Stan Hu	2017-08-08	29	-55/+196
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
\| * \| \| \| \|	Exclude merge_jid on Import/Export attribute configuration	Oswaldo Ferreira	2017-08-07	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Re-add column locked_at on migration rollback31207-clean-locked-merge-requests	Oswaldo Ferreira	2017-08-07	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Move locked_at removal to post-deployment migration	Oswaldo Ferreira	2017-08-07	3	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Store MergeWorker JID on merge request, and clean up stuck merges	Oswaldo Ferreira	2017-08-07	28	-54/+193
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '33874_confi' into 'master'	Jacob Schatz	2017-08-07	14	-28/+434
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	33874 confidential issue redesign See merge request !12801
\| * \| \| \| \| \|	33874 confidential issue redesign	Regis Boudinot	2017-08-07	14	-28/+434
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Clement Ho	2017-08-07	4	-3/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35729-user-dropdown-in-filtered-search-does-not-load-avatar-on-master' into 'master' Resolve "User dropdown in filtered search does not load avatar on `master`" Closes #35729 See merge request !13181
\| * \| \| \| \| \|	Resolve "User dropdown in filtered search does not load avatar on `master`"	Tim Zallmann	2017-08-07	4	-3/+7
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'	Robert Speicher	2017-08-07	3	-20/+63
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268
\| * \| \| \| \| \|	Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitaly	Ahmad Sherif	2017-08-07	6	-24/+67
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#443
* \| \| \| \| \|	Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'	Robert Speicher	2017-08-07	5	-5/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259
\| * \| \| \| \| \|	Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitaly	Ahmad Sherif	2017-08-07	5	-5/+25
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#437
* \| \| \| \| \|	Merge branch '32844-issuables-performance' into 'master'	Sean McGivern	2017-08-07	14	-14/+198
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issuables: Move some code from create services to Sidekiq workers See merge request !13326
\| * \| \| \| \| \|	Move some after_create parts to worker to improve performance32844-issuables-performance	Jarka Kadlecova	2017-08-07	14	-14/+198
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'perf.policy-runner-reduce-loops' into 'master'	Sean McGivern	2017-08-07	1	-5/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DeclarativePolicy: reduce iterations of the step set See merge request !13352
\| * \| \| \| \| \| \|	more eagerly bail when the state is prevented	http://jneen.net/	2017-08-07	1	-4/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	reduce iterations by keeping a count of remaining enablers	http://jneen.net/	2017-08-07	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than iterating the whole remaining step set with .all?(&:prevent?)