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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add project_members controller when not signed in40642-members-tab-not-signed-in	Annabel Dunstone Gray	2017-11-29	1	-1/+1
\|
*	Merge branch '40629-icon-styles' into 'master'	Annabel Dunstone Gray	2017-11-29	1	-28/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	fix icon colors in commit list Closes #40629 See merge request gitlab-org/gitlab-ce!15640
\| *	fix icon colors in commit list40629-icon-styles	Simon Knox	2017-11-29	1	-28/+14
\| \| \| \| \| \| \| \| \| \| \| \|	this is not a great way to do this. But using currentColor for these means we are competing with this selector: ul.content-list li a
* \|	Merge branch 'bvl-double-fork' into 'master'	Phil Hughes	2017-11-29	4	-17/+48
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653
\| * \|	Redirect to an already forked project if it exists	Bob Van Landuyt	2017-11-29	4	-17/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before the we would try to `POST` to the project path, which would result in a 404, because that `POST` is not supported. By changing this back to a normal link, not not handled in JS, we can immeadiatly redirect.
* \| \|	Merge branch '32057_support_ordering_project_notes_in_notes_api' into 'master'	Sean McGivern	2017-11-29	4	-13/+156
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support ordering of project notes in notes api See merge request gitlab-org/gitlab-ce!15342
\| * \| \|	support ordering of project notes in notes api	haseeb	2017-11-29	4	-13/+156
\|/ / /
* \| \|	Merge branch 'docs-what-requires-downtime-link' into 'master'	Robert Speicher	2017-11-29	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix link that was linking to `html` instead of `md` See merge request gitlab-org/gitlab-ce!15646
\| * \| \|	fix link that was linking to `html` instead of `md`docs-what-requires-downtime-link	digitalMoksha	2017-11-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(to be consistent)
* \| \| \|	Merge branch 'remove-mr-diff-serialised-columns' into 'master'	Yorick Peterse	2017-11-29	26	-568/+524
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove serialised diff and commit columns Closes #39533 See merge request gitlab-org/gitlab-ce!15582
\| * \| \| \|	Improve indexes on merge_request_diffsremove-mr-diff-serialised-columns	Sean McGivern	2017-11-28	3	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For getting the SHAs from an MR to find pipelines, we get the last 100 MR diffs for the MR, and find commits from those. This was un-indexed before, because the index was not a composite index on merge_request_diff_id, id. Changing that means that this scope can exclusively use indexes.
\| * \| \| \|	Remove serialised diff and commit columns	Sean McGivern	2017-11-28	23	-566/+488
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit.
\| * \| \| \|	Fix instructions for creating project templates	Sean McGivern	2017-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidekiq has to be running too.
* \| \| \| \|	Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master'	Sean McGivern	2017-11-29	5	-10/+109
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create fork networks for deleted source projects Closes #40072 See merge request gitlab-org/gitlab-ce!15595
\| * \| \| \| \|	Reschedule the migration to populate fork networksbvl-fork-networks-for-deleted-projects	Bob Van Landuyt	2017-11-29	2	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rescheduling will make sure the fork networks with a deleted source project are created.
\| * \| \| \| \|	Create fork networks for forks for which the source was deleted.	Bob Van Landuyt	2017-11-29	3	-9/+81
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That way we can join forks-of-forks into the same network even if their original source was deleted. Consider the following: `awesome-oss/badger` is forked to `coolstuff/badger`, which is forked to `user-a/badger` which in turn is forked to `user-b/badger`. When `awesome-oss/badger` is deleted, we will now create a fork network with `coolstuff/badger` as the root. The `user-a/badger` and `user-b/badger` projects will be added to the network.
* \| \| \| \|	Merge branch 'backport_from_ee' into 'master'	Rémy Coutable	2017-11-29	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor backport from EE See merge request gitlab-org/gitlab-ce!15647
\| * \| \| \| \|	Minor backport from EEbackport_from_ee	Valery Sizov	2017-11-29	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'multi-file-editor-css-fixes' into 'master'	Tim Zallmann	2017-11-29	26	-384/+710
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added IDE commit panel Closes #40041 See merge request gitlab-org/gitlab-ce!15583
\| * \| \| \| \|	fixed rspecmulti-file-editor-css-fixes	Phil Hughes	2017-11-24	4	-4/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added getter specs
\| * \| \| \| \|	added specs	Phil Hughes	2017-11-24	13	-67/+207
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed scss-lint
\| * \| \| \| \|	fixed icon name typo	Phil Hughes	2017-11-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Added IDE commit panel	Phil Hughes	2017-11-24	15	-337/+492
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #40041
* \| \| \| \| \|	Merge branch '39827-fix-projects-dropdown-overflow' into 'master'	Phil Hughes	2017-11-29	4	-3/+40
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix item name and namespace text overflow in Projects dropdown Closes #39827 See merge request gitlab-org/gitlab-ce!15451
\| * \| \| \| \|	Fix item name and namespace text overflow in Projects dropdown	Kushal Pandya	2017-11-29	4	-3/+40
\|/ / / / /
* \| \| \| \|	Merge branch 'events-atom-feed-author-query' into 'master'	Douwe Maan	2017-11-29	2	-1/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reuse authors when rendering event Atom feeds See merge request gitlab-org/gitlab-ce!15630
\| * \| \| \| \|	Reuse authors when rendering event Atom feedsevents-atom-feed-author-query	Yorick Peterse	2017-11-28	2	-1/+11
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we'd use "event.author_email" which translates to "event.author.email". This would result in an extra query being executed _for every event_ just to get the same author's Email address. Instead of doing all this useless work we can just pass the User object returned by "event.author" since: 1. This allows us to re-use the user object's Email address. 2. Authors are eager-loaded, so this doesn't cause any N+1 queries.
* \| \| \| \|	Merge branch ↵	Sean McGivern	2017-11-29	15	-271/+831
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'21143-customize-branch-name-when-using-create-branch-in-an-issue' into 'master' Resolve "Customize branch name when using create branch in an issue" Closes #21143 See merge request gitlab-org/gitlab-ce!13884
\| * \| \| \| \|	Add an ability to use a custom branch name on creation from issues	Vitaliy @blackst0ne Klachkov	2017-11-25	15	-271/+831
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-iife-autosize' into 'master'	Fatih Acet	2017-11-29	1	-17/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve autosize spec See merge request gitlab-org/gitlab-ce!15620
\| * \| \| \| \| \|	Remove iife and eslint disableremove-iife-autosize	Clement Ho	2017-11-27	1	-17/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gitaly-ssh-upload-pack-opt-out' into 'master'	Sean McGivern	2017-11-29	2	-10/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSHUploadPack over Gitaly is now OptOut Closes gitaly#730 See merge request gitlab-org/gitlab-ce!15623
\| * \| \| \| \| \| \|	SSHUploadPack over Gitaly is now OptOutgitaly-ssh-upload-pack-opt-out	Kim "BKC" Carlbäcker	2017-11-29	2	-10/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Better gitaly-handling in /api/internal/allowed specs
* \| \| \| \| \| \| \|	Merge branch 'backport-border-inline-edit' into 'master'	Fatih Acet	2017-11-29	6	-13/+20
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport - Add border for epic edit button See merge request gitlab-org/gitlab-ce!15637
\| * \| \| \| \| \| \|	Backport border inline editbackport-border-inline-edit	Clement Ho	2017-11-28	6	-13/+20
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'backport-epic-tasklist' into 'master'	Fatih Acet	2017-11-29	6	-42/+86
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport epic tasklist See merge request gitlab-org/gitlab-ce!15556
\| * \| \| \| \| \| \| \|	Backport epic tasklist	Clement Ho	2017-11-29	6	-42/+86
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'an/gitaly-timeouts' into 'master'	Rémy Coutable	2017-11-29	13	-24/+231
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add timeouts for Gitaly calls Closes gitaly#656 See merge request gitlab-org/gitlab-ce!15047
\| * \| \| \| \| \| \| \|	Add timeouts for Gitaly calls	Andrew Newdigate	2017-11-29	13	-24/+231
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'dm-search-pattern' into 'master'	Sean McGivern	2017-11-29	17	-85/+84
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use fuzzy search with minimum length of 3 characters where appropriate Closes #40512 See merge request gitlab-org/gitlab-ce!15592
\| * \| \| \| \| \| \| \|	Use fuzzy search with minimum length of 3 characters where appropriatedm-search-pattern	Douwe Maan	2017-11-27	14	-54/+39
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Modify fuzzy_arel_match to search for equality when a term shorter than 3 ↵	Douwe Maan	2017-11-27	2	-7/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	characters is provided
\| * \| \| \| \| \| \| \|	Rename to_fuzzy_arel to fuzzy_arel_match	Douwe Maan	2017-11-24	3	-10/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use Gitlab::SQL::Pattern where appropriate	Douwe Maan	2017-11-24	8	-25/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-empty-scss-file' into 'master'	Phil Hughes	2017-11-29	1	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove empty new-nav.scss See merge request gitlab-org/gitlab-ce!15619
\| * \| \| \| \| \| \| \| \|	Remove empty new-nav.scssremove-empty-scss-file	Annabel Dunstone Gray	2017-11-27	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix_invalid_new_pipeline_form' into 'master'	Filipa Lacerda	2017-11-29	3	-0/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	initializes the branches dropdown upon invalid entry Closes #40012 See merge request gitlab-org/gitlab-ce!15588
\| * \| \| \| \| \| \| \| \| \|	initializes the branches dropdown upon invalid entry	Christiaan Van den Poel	2017-11-27	3	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Changelog added feature spec
* \| \| \| \| \| \| \| \| \| \|	Merge branch '40638-star-icon' into 'master'	Clement Ho	2017-11-28	1	-8/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix star icon color/stroke Closes #40638 See merge request gitlab-org/gitlab-ce!15636
\| * \| \| \| \| \| \| \| \| \|	Fix star icon color/stroke	Annabel Dunstone Gray	2017-11-28	1	-8/+1
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|