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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Merge branch 'an/use-branch-exists-over-branch-names-include' into 'master'	Rémy Coutable	2017-10-10	9	-10/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop using `branch_names.include?` and use `branch_exists?` See merge request gitlab-org/gitlab-ce!14778
\| * \| \| \| \| \|	Stop using `branch_names.include?` and use `branch_exists?`	Andrew Newdigate	2017-10-10	9	-10/+15
\|/ / / / / /
* \| \| \| \| \|	Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-label	Phil Hughes	2017-10-10	10	-374/+321
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove u2f from global namespace See merge request gitlab-org/gitlab-ce!14776
\| * \| \| \| \| \|	Remove u2f from globalnamespace38869-u2f	Filipa Lacerda	2017-10-09	10	-374/+321
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'flash-es6-module' into 'master'	Filipa Lacerda	2017-10-10	74	-203/+454
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flash is now a ES6 module See merge request gitlab-org/gitlab-ce!14626
\| * \| \| \| \| \|	removed global eslint for remaining filesflash-es6-module	Phil Hughes	2017-10-10	5	-8/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fixed notes specs	Phil Hughes	2017-10-10	3	-13/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed how the container class is added onto the text element more specs
\| * \| \| \| \| \|	karma spec fixes	Phil Hughes	2017-10-10	6	-18/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fixed eslint	Phil Hughes	2017-10-10	2	-11/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	flash tests	Phil Hughes	2017-10-10	2	-11/+282
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added back in documentation comment to flash file
\| * \| \| \| \| \|	spec fixes	Phil Hughes	2017-10-10	3	-8/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Flash is now a ES6 module	Phil Hughes	2017-10-10	67	-179/+148
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS.
* \| \| \| \| \| \|	Merge branch 'fix/skip-gitaly-mock-linting-error' into 'master'	Rémy Coutable	2017-10-10	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a liniting error introduced by !14652 See merge request gitlab-org/gitlab-ce!14790
\| * \| \| \| \| \| \|	Fix a liniting error introduced by !14652	Ahmad Sherif	2017-10-10	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'	Douwe Maan	2017-10-10	15	-18/+67
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443
\| * \| \| \| \| \| \|	Changed Group Icon URL Back to try option38245-private-avatars-are-not-cdn-compatible	Tim Zallmann	2017-10-10	1	-5/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix for Lint Error + Upload Test	Tim Zallmann	2017-10-09	2	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Based on MR simplified the logic	Tim Zallmann	2017-10-09	3	-17/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Removed 2 uncommented lines	Tim Zallmann	2017-10-06	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed Linting Error	Tim Zallmann	2017-10-05	1	-8/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Another Change for cleanup	Tim Zallmann	2017-10-05	1	-6/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updates based on MR comments	Tim Zallmann	2017-10-05	3	-16/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed Tests	Tim Zallmann	2017-10-04	3	-8/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed Test	Tim Zallmann	2017-10-04	2	-5/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed Linting errors + tests	Tim Zallmann	2017-10-04	4	-14/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Created group_icon and group_icon_url	Tim Zallmann	2017-10-04	12	-17/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests for these new helper methods
\| * \| \| \| \| \| \|	Making private project avatars use local paths + Some Group Icons	Tim Zallmann	2017-10-04	4	-9/+27
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38941-lock-note-fix' into 'master'	Sean McGivern	2017-10-10	3	-3/+41
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix text for the merge request lock system note Closes #38941 See merge request gitlab-org/gitlab-ce!14779
\| * \| \| \| \| \| \| \|	Fix text for the merge request lock system note	Jarka Kadlecova	2017-10-10	3	-3/+41
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'acet-fix-paste-on-comment-form' into 'master'	Filipa Lacerda	2017-10-10	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trigger change event of the markdown textarea to allow Vue catch the programmatic changes. Closes #38441 See merge request gitlab-org/gitlab-ce!14539
\| * \| \| \| \| \| \| \| \|	Trigger change event of the markdown textarea to allow Vue catch the ↵acet-fix-paste-on-comment-form	Fatih Acet	2017-09-27	1	-1/+4
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	programmatic changes.
* \| \| \| \| \| \| \| \|	Merge branch 'fix-timestampz-cop' into 'master'	Grzegorz Bizon	2017-10-10	6	-7/+43
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also warn on timestamp in datetime migration cop See merge request gitlab-org/gitlab-ce!14784
\| * \| \| \| \| \| \| \| \|	Ignore existing Migration/Datetime cop offenders	Sean McGivern	2017-10-10	4	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Also warn on timestamp in datetime migration copfix-timestampz-cop	Sean McGivern	2017-10-10	2	-7/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The types `timestamp` and `datetime` are aliases: https://github.com/rails/rails/blob/v4.2.10/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L362-L364
* \| \| \| \| \| \| \| \| \|	Merge branch '38869-ci-global' into 'master'	Phil Hughes	2017-10-10	10	-121/+110
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Build code from global namespace See merge request gitlab-org/gitlab-ce!14744
\| * \| \| \| \| \| \| \| \|	Remove Build code from global namespace	Filipa Lacerda	2017-10-10	10	-121/+110
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into ↵	Robert Speicher	2017-10-10	3	-22/+92
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Migrate Workhorse Send{Diff,Patch} to Gitaly See merge request gitlab-org/gitlab-ce!14652
\| * \| \| \| \| \| \| \|	Migrate Workhorse Send{Diff,Patch} to Gitalyfeature/migrate-workhorse-send-git-diff-patch-to-gitaly	Ahmad Sherif	2017-10-09	3	-22/+92
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ee-38771-ce-backport' into 'master'	Douwe Maan	2017-10-10	5	-2/+52
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports EE 38771 changes to CE. See merge request gitlab-org/gitlab-ce!14782
\| * \| \| \| \| \| \| \|	Backports EE 38771 changes to CE.	Tiago Botelho	2017-10-10	5	-2/+52
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38869-api' into 'master'	Phil Hughes	2017-10-10	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Api from main.js See merge request gitlab-org/gitlab-ce!14774
\| * \| \| \| \| \| \| \|	Remove Api from main.js38869-api	Filipa Lacerda	2017-10-09	1	-1/+0
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-clarify-naming-imports-docs' into 'master'	Filipa Lacerda	2017-10-10	1	-4/+26
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make naming imports more clear Closes #38795 See merge request gitlab-org/gitlab-ce!14761
\| * \| \| \| \| \| \|	Make naming imports more clearwinh-clarify-naming-imports-docs winh-clarify-naming-imports	Winnie Hellmann	2017-10-09	1	-4/+26
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Tim Zallmann	2017-10-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38574-superfluous-export-in-advanced-settings-of-project-settings' into 'master' Resolve "Superfluous "Export" in "Advanced settings" of project settings" Closes #38574 See merge request gitlab-org/gitlab-ce!14773
\| * \| \| \| \| \| \| \|	fix incorrect description for advanced settings section of project settings38574-superfluous-export-in-advanced-settings-of-project-settings	Mike Greiling	2017-10-09	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '34841-todos' into 'master'	Phil Hughes	2017-10-10	5	-52/+69
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bad type checking to prevent 0 count badge to be shown Closes #34841 See merge request gitlab-org/gitlab-ce!14767
\| * \| \| \| \| \| \|	Fix bad type checking to prevent 0 count badge to be shown	Filipa Lacerda	2017-10-10	5	-52/+69
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'wiki-empty-page-heading' into 'master'	Filipa Lacerda	2017-10-09	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wiki empty page translation namespace not being removed Closes #38920 See merge request gitlab-org/gitlab-ce!14759
\| * \| \| \| \| \| \|	Fix wiki empty page translation namespace not being removedwiki-empty-page-heading	Phil Hughes	2017-10-09	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38920