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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Do not retry jobs that are allowed to failrc/do-not-retry-ee_compat_check	Rémy Coutable	2017-10-04	1	-0/+2
\| \| \| \| \| \| \|	The `ee_compat_check` job can take 10 minutes to run so it's a shame to retry it and loose 10 minutes if it fails for a good reason. Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'fix-edit-project-service-cancel-button-position' into 'master'	Rémy Coutable	2017-10-04	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Fix edit project service cancel button position See merge request gitlab-org/gitlab-ce!14596
\| *	Fix edit project service cancel button position	Matt Coleman	2017-09-29	2	-1/+6
\| \|
* \|	Merge branch 'fork-layout-cleanup' into 'master'	Filipa Lacerda	2017-10-04	5	-108/+78
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup the fork layout See merge request gitlab-org/gitlab-ce!14617
\| * \|	fixed specsfork-layout-cleanup	Phil Hughes	2017-10-02	2	-1/+2
\| \| \|
\| * \|	Cleanup the fork layout	Phil Hughes	2017-10-02	4	-107/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Cleans the fork project layout by removing the grid & reverting back to full flexbox to allow for the layout to correctly expand. - Removes duplicated markup - Fixes a bug where the forked project would trigger the load indicator
* \| \|	Merge branch '26890-fix-default-branches-sorting' into 'master'	Robert Speicher	2017-10-04	5	-147/+142
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the default branches sorting to actually be 'Last updated' Closes #26890 See merge request gitlab-org/gitlab-ce!14295
\| * \| \|	Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sorting	Rémy Coutable	2017-09-25	5	-147/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'docs/images-update' into 'master'	Job van der Voort	2017-10-04	70	-128/+99
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update images Closes #38487 See merge request gitlab-org/gitlab-ce!14655
\| * \| \| \|	Update a bunch of docs images	Achilleas Pipinellis	2017-10-04	70	-128/+99
\| \| \| \| \|
* \| \| \| \|	Merge branch 'capture-rev-list-errors' into 'master'	Sean McGivern	2017-10-04	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include RevList error messages in exceptions See merge request gitlab-org/gitlab-ce!14658
\| * \| \| \| \|	Include RevList error messages in exceptionscapture-rev-list-errors	Jacob Vosmaer	2017-10-03	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-fetch-ref' into 'master'	Sean McGivern	2017-10-04	7	-22/+80
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let fetch_ref pull from Gitaly instead of from disk Closes gitaly#585 See merge request gitlab-org/gitlab-ce!14588
\| * \| \| \| \| \|	Let fetch_ref pull from Gitaly instead of from disk	Jacob Vosmaer	2017-10-04	7	-22/+80
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'missing-exception-variable' into 'master'	Sean McGivern	2017-10-04	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing exception variable See merge request gitlab-org/gitlab-ce!14677
\| * \| \| \| \| \| \|	Add missing exception variable	Jacob Vosmaer	2017-10-04	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'merge-request-notes-performance' into 'master'	Sean McGivern	2017-10-04	4	-10/+33
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a UNION ALL for getting merge request notes Closes #38508 See merge request gitlab-org/gitlab-ce!14620
\| * \| \| \| \| \|	Use a UNION ALL for getting merge request notesmerge-request-notes-performance	Yorick Peterse	2017-10-02	4	-10/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this particular case the use of UNION ALL leads to a better query plan compared to using 1 big query that uses an OR statement to combine different data sources. See https://gitlab.com/gitlab-org/gitlab-ce/issues/38508 for more information.
* \| \| \| \| \| \|	Merge branch 'js-load-specific-locales' into 'master'	Phil Hughes	2017-10-04	6	-26/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load only the currently needed JS locale file Closes #38470 See merge request gitlab-org/gitlab-ce!14533
\| * \| \| \| \| \| \|	Load only the currently needed JS locale file	Tim Zallmann	2017-10-04	6	-26/+19
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix_migration_with_fast_forward_option' into 'master'	Sean McGivern	2017-10-04	3	-3/+30
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix AddFastForwardOptionToProject migration See merge request gitlab-org/gitlab-ce!14676
\| * \| \| \| \| \|	Add a new migration to make sure that fast forward column exists in projects ↵fix_migration_with_fast_forward_option	Valery Sizov	2017-10-04	3	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	table
\| * \| \| \| \| \|	Fix AddFastForwardOptionToProject migration	Valery Sizov	2017-10-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'dev/master'	Jarka Kadlecova	2017-10-04	1	-0/+4
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Jarka Kadlecova	2017-10-04	1	-0/+4
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Jarka Kadlecova	2017-10-04	1	-0/+4
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Update CHANGELOG.md for 9.5.7	Jose Ivan Vargas	2017-10-03	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch '36742-hide-close-mr-button-on-merge' into 'master'	Fatih Acet	2017-10-04	6	-1/+67
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide close MR button after merge without reloading page Closes #36742 See merge request gitlab-org/gitlab-ce!14122
\| * \| \| \| \| \| \| \| \|	Hide close MR button after merge without reloading page	Jacopo	2017-09-24	6	-1/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After merging a MR the close button is hidden, without reloading the page.
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-pat-revoke' into 'master'	Sean McGivern	2017-10-04	4	-3/+14
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set default scope on PATs that don't have one set to allow them to be revoked Closes #38650 See merge request gitlab-org/gitlab-ce!14660
\| * \| \| \| \| \| \| \| \|	Set default scope on PATs that don't have one set to allow them to be revokeddm-pat-revoke	Douwe Maan	2017-10-03	4	-3/+14
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'icons-profile-icons' into 'master'	Phil Hughes	2017-10-04	1	-9/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Profile Events Helper to use SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14577
\| * \| \| \| \| \| \| \| \|	Updated Profile Events Helper to use SVG Sprite Icons	Tim Zallmann	2017-10-04	1	-9/+11
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '3612-update-script-template-order-in-vue-files' into 'master'	Filipa Lacerda	2017-10-04	12	-97/+121
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-arrange <script> tags before <template> tags in .vue files Closes #38743 See merge request gitlab-org/gitlab-ce!14671
\| * \| \| \| \| \| \| \| \|	Re-arrange <script> tags before <template> tags in .vue files3612-update-script-template-order-in-vue-files	Eric Eastwood	2017-10-03	12	-97/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38743
* \| \| \| \| \| \| \| \| \|	Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master'	Filipa Lacerda	2017-10-04	2	-0/+41
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable comment textarea while submitting a new comment. Closes #37858 See merge request gitlab-org/gitlab-ce!14541
\| * \| \| \| \| \| \| \| \| \|	Add tests for handle save method of the comment form.acet-disabled-comment-textarea-while-requesting	Fatih Acet	2017-10-03	1	-0/+40
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Disable comment textarea while submitting a new comment.	Fatih Acet	2017-10-03	1	-0/+1
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-vue-styleguide-link-docs' into 'master'	Filipa Lacerda	2017-10-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to Vue.js style guide See merge request gitlab-org/gitlab-ce!14667
\| * \| \| \| \| \| \| \| \| \|	Fix link to Vue.js style guidewinh-vue-styleguide-link-docs winh-vue-styleguide-link	Winnie Hellmann	2017-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-ssh-key-mutation' into 'master'	Douwe Maan	2017-10-04	2	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure key fingerprints are generated correctly when modified See merge request gitlab-org/gitlab-ce!14663
\| * \| \| \| \| \| \| \| \| \| \|	Ensure key fingerprints are generated correctly when modified	Nick Thomas	2017-10-03	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '31050-registry-image-lists' into 'master'	Grzegorz Bizon	2017-10-04	43	-155/+1541
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lazy load and paginate registry image list Closes #31050 See merge request gitlab-org/gitlab-ce!14303
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop error31050-registry-image-lists	Filipa Lacerda	2017-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix broken test	Filipa Lacerda	2017-10-03	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop failures	Kamil Trzcinski	2017-10-03	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add serializer matchers	Kamil Trzcinski	2017-10-02	12	-62/+279
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Render separator only when both values are present	Filipa Lacerda	2017-09-28	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Improve loading icon	Filipa Lacerda	2017-09-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 31050-registry-image-lists	Filipa Lacerda	2017-09-28	251	-1857/+2772
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (91 commits) refactor emails service fix update service refactor users update service refactor keys controller refactor some controllers to make them EE friendly fix specs fix users update service update initializers refactor services to match EE signature Change recommended MySQL version to 5.6 Clean merge_jid whenever necessary on the merge process Rolling back change to n+1 detection Breadcrumbs receives padding when double lined Add EEP to headings Added some Gitaly docs to `docs/development` Check orientation of profile image Fixes commit comments in side-by-side diff view Update CHANGELOG.md for 10.0.2 Fix linting errors in locale/index.js Update CI parallelization description ...