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

	Commit message (Collapse)	Author	Age	Files	Lines
*	actually require in devise helpers in login_helpersbugfix.require-devise-helpers	http://jneen.net/	2017-08-03	1	-0/+2
\|
*	Merge branch 'winh-dropdown-mixin' into 'master'	Annabel Dunstone Gray	2017-08-03	4	-64/+11
\|\ \| \| \| \| \| \| \| \|	Use mixin for new dropdown style See merge request !13274
\| *	Use mixin for new dropdown style	Winnie Hellmann	2017-08-03	4	-64/+11
\|/
*	Merge branch 'dev.referable-inspect' into 'master'	Sean McGivern	2017-08-03	2	-0/+17
\|\ \| \| \| \| \| \| \| \|	implement #inspect for all Referables See merge request !13285
\| *	implement #inspect for all Referablesdev.referable-inspect	http://jneen.net/	2017-08-01	2	-0/+17
\| \|
* \|	Merge branch '3686_make_tarball_download_url' into 'master'	Rémy Coutable	2017-08-03	4	-5/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #3686 make tarball download url to end with extension Closes #3686 See merge request !13178
\| * \|	fix #3686 make tarball download url to end with extension	haseeb	2017-08-03	4	-5/+13
\|/ /
* \|	Merge branch 'use-rspec-support-helper' into 'master'	Rémy Coutable	2017-08-03	14	-51/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't include EmailHelpers manually, pick with rspec See merge request !13257
\| * \|	Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helper	Lin Jen-Shin	2017-08-03	14	-51/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now.
* \| \|	Merge branch '35133_strip_newlines_from_ssh_keys' into 'master'	Rémy Coutable	2017-08-03	2	-8/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #35133 strip new lines from ssh keys Closes #35133 See merge request !13234
\| * \| \|	fix #35133 strip new lines from ssh keys	haseeb	2017-08-03	2	-8/+9
\|/ / /
* \| \|	Merge branch 'reorganise-issues-indexes-for-sorting' into 'master'	Sean McGivern	2017-08-03	3	-3/+51
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-organise "issues" indexes for faster ordering See merge request !13278
\| * \| \|	Re-organise "issues" indexes for faster orderingreorganise-issues-indexes-for-sorting	Yorick Peterse	2017-08-03	3	-3/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By adding various composite indexes we can reduce the time spent retrieving issue lists. Because of the way these indexes are built column wise we can also remove some standalone indexes, keeping the total number of indexes in check.
* \| \| \|	Merge branch 'fix-oauth-checkboxes' into 'master'	Filipa Lacerda	2017-08-03	3	-0/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
\| * \| \| \|	Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxes	Phil Hughes	2017-08-03	3	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35882
* \| \| \| \|	Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'	Robert Speicher	2017-08-03	5	-31/+57
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#count_commits to Gitaly Closes gitaly#415 See merge request !13121
\| * \| \| \| \|	Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitaly	Ahmad Sherif	2017-08-02	5	-31/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#415
* \| \| \| \| \|	Merge branch 'merge-request-commits-background-migration' into 'master'	Rémy Coutable	2017-08-03	5	-5/+388
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request commits background migration See merge request !12685
\| * \| \| \| \| \|	Migrate MR commits and diffs to new tablesmerge-request-commits-background-migration	Sean McGivern	2017-08-03	5	-5/+388
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, we stored these as serialised fields - `st_{commits,diffs}` - on the `merge_request_diffs` table. These now have their own tables - `merge_request_diff_{commits,diffs}` - with a column for each attribute of the serialised data. Add a background migration to go through the existing MR diffs and migrate them to the new format. Ignore any contents that cannot be displayed. Assuming that we have 5 million rows to migrate, and each batch of 2,500 rows can be completed in 5 minutes, this will take about 7 days to migrate everything.
* \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2017-08-03	1	-31/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move API "basic usage" to be more visible See merge request !13171
\| * \| \| \| \| \| \|	Explicitly spell out where the API root is	AJ Jordan	2017-07-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I found this basic information extrememly hard to find when I looked at this page.
\| * \| \| \| \| \| \|	Move API "basic usage" to be more visible	AJ Jordan	2017-07-28	1	-31/+31
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'abuango-imap-doc-fix' into 'master'	Achilleas Pipinellis	2017-08-03	1	-0/+14
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update reply_by_email_postfix_setup.md, included starting courier-authdaemon after installation. See merge request !13218
\| * \| \| \| \| \| \|	Update reply_by_email_postfix_setup.md, included starting courier-authdaemon ↵	Abubakar Ango	2017-08-03	1	-0/+14
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after installation.
* \| \| \| \| \| \|	Merge branch '35232-next-unresolved' into 'master'	Clement Ho	2017-08-03	2	-5/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix Jump to next discussion Closes #35232 See merge request !13076
\| * \| \| \| \| \| \|	fix Jump to next discussion35232-next-unresolved	Simon Knox	2017-07-27	2	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes tab was renamed to show, was previously overridden in merge_request_tabs.js
* \| \| \| \| \| \| \|	Merge branch 'winh-project-page-dropdown-style' into 'master'	Annabel Dunstone Gray	2017-08-03	4	-3/+55
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make dropdown style on project page consistent Closes #35778 See merge request !13193
\| * \| \| \| \| \| \|	Make dropdown style on project page consistent	Winnie Hellmann	2017-08-03	4	-3/+55
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '28472-ignore-auto-generated-mails' into 'master'	Sean McGivern	2017-08-03	8	-26/+51
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't send rejection mails for all auto-generated mails Closes #28472 See merge request !13254
\| * \| \| \| \| \| \|	Check against "Auto-Submitted: no" instead	Lin Jen-Shin	2017-08-03	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would be much more accurate. We assume this is an auto-generated email if such header is provided, and the value is not "no". It could also be: "auto-generated", "auto-replied", or other values from extension. It seems that only "no" could mean that this is sent by a human. See: https://tools.ietf.org/html/rfc3834
\| * \| \| \| \| \| \|	Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mails	Lin Jen-Shin	2017-08-03	8	-26/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also make it easier to have mailer helper
* \| \| \| \| \| \| \|	Merge branch 'fix-gitaly-install' into 'master'	Rémy Coutable	2017-08-03	3	-12/+17
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we run installation Rake tasks in a clean env in TestEnv Closes #35859 See merge request !13249
\| * \| \| \| \| \| \|	Don't call load_tasks as this would load the tasks twicefix-gitaly-install	Rémy Coutable	2017-08-02	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Ensure we run installation Rake tasks in a clean env in TestEnv	Rémy Coutable	2017-08-02	2	-6/+11
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we call `system('rake', 'taks_name')`, `ENV['RUBYOPT']` is set to `'-rbundler/setup'` but some tasks (e.g. `gitlab:gitaly:install` need a clean env since they install their own Gem bundle. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'dm-api-current-user' into 'master'	Sean McGivern	2017-08-03	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not validate CSRF token in API unless needed Closes #35705 See merge request !13256
\| * \| \| \| \| \| \|	Do not validate CSRF token in API unless neededdm-api-current-user	Douwe Maan	2017-08-02	2	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitaly-test-mtime-check' into 'master'	Rémy Coutable	2017-08-03	2	-1/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove test gitaly when older than version file See merge request !13250
\| * \| \| \| \| \| \| \|	Remove test gitaly when older than version file	Jacob Vosmaer (GitLab)	2017-08-03	2	-1/+21
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sidebar-fly-out-sub-nav' into 'master'	Filipa Lacerda	2017-08-03	5	-38/+335
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fly-out dropdown menu in new sidebar Closes #34026 See merge request !12938
\| * \ \ \ \ \ \ \	Merge branch 'master' into sidebar-fly-out-sub-navsidebar-fly-out-sub-nav	Phil Hughes	2017-08-02	1677	-9482/+16762
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	stop mobile from showing the sub-items	Phil Hughes	2017-08-02	2	-3/+51
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	changed variable names	Phil Hughes	2017-08-02	1	-10/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Math.floor the value in the tests	Phil Hughes	2017-08-01	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed translate3d test	Phil Hughes	2017-08-01	2	-6/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	reverted the JS timeout code	Phil Hughes	2017-08-01	3	-73/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improved specs so that they pass
\| * \| \| \| \| \| \| \|	added mouseleave timeout with JS	Phil Hughes	2017-08-01	3	-20/+206
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed inside padding of fly-out menu	Phil Hughes	2017-07-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	updated hover text color of main links in sidebar	Phil Hughes	2017-07-28	1	-8/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed colors in fly-out navigation fixed spacing in fly-out navigation
\| * \| \| \| \| \| \| \|	style updates	Phil Hughes	2017-07-26	2	-37/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed weird dropdown items in issues when on merge request page
\| * \| \| \| \| \| \| \|	added extra padding around fly-out menu to delay hiding	Phil Hughes	2017-07-25	1	-1/+11
\| \| \| \| \| \| \| \| \|