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

	Commit message (Collapse)	Author	Age	Files	Lines
*	move u2f library to webpackmove-u2f-bundle	Mike Greiling	2017-03-07	4	-4/+3
\|
*	Merge branch 'fix-project-last-commit-padding' into 'master'	Dmitriy Zaporozhets	2017-03-07	2	-23/+9
\|\ \| \| \| \| \| \| \| \|	Fix project-last-commit alignment See merge request !9745
\| *	Fix project-last-commit alignmentfix-project-last-commit-padding	Annabel Dunstone Gray	2017-03-06	2	-23/+9
\| \|
* \|	Merge branch 'remove-readme-option' into 'master'	Dmitriy Zaporozhets	2017-03-07	3	-11/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove readme-only project view preference See merge request !9744
\| * \|	Remove readme-only project view preferenceremove-readme-option	Annabel Dunstone Gray	2017-03-06	3	-11/+6
\| \|/
* \|	Merge branch '23948-assign-to-me' into 'master'	Alfredo Sumaran	2017-03-07	10	-23/+55
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	re-add Assign to Me link on new MR/Issue forms Closes #23948 See merge request !9499
\| * \|	re-add Assign to Me link on new MR/Issue forms	Simon Knox	2017-03-07	10	-23/+55
\| \| \|
* \| \|	Merge branch 'widget-widget-widget-fun' into 'master'	Jacob Schatz	2017-03-07	7	-51/+133
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request widget merged state styling See merge request !9352
\| * \| \|	thinner bottom header borderwidget-widget-widget-fun	Regis	2017-03-06	1	-0/+1
\| \| \| \|
\| * \| \|	make header match old 16px padding of body contents	Regis	2017-03-06	1	-2/+2
\| \| \| \|
\| * \| \|	fix border radius bottom for header	Regis	2017-03-06	1	-1/+2
\| \| \| \|
\| * \| \|	match padding for mr-widget sections	Regis	2017-03-06	1	-1/+1
\| \| \| \|
\| * \| \|	one period instead of two	Regis	2017-03-06	1	-1/+1
\| \| \| \|
\| * \| \|	structure html to handle single or double merge states with new style changes	Regis	2017-03-06	2	-2/+2
\| \| \| \|
\| * \| \|	scss linting	Regis	2017-03-06	1	-3/+3
\| \| \| \|
\| * \| \|	MWBS html	Regis	2017-03-06	1	-9/+14
\| \| \| \|
\| * \| \|	fix contains merge conflicts button	Regis	2017-03-03	1	-2/+1
\| \| \| \|
\| * \| \|	Improve CSS for treeview with pipelines to make it responsible	Filipa Lacerda	2017-03-04	2	-40/+33
\| \| \| \|
\| * \| \|	add grey lines - adequate spacing for action buttons	Regis	2017-03-03	4	-34/+104
\| \| \| \|
\| * \| \|	Merge branch 'master' into widget-widget-widget-fun	Filipa Lacerda	2017-03-03	624	-4500/+9596
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (163 commits) Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM Remove useless assignment Rename query parameter to `membership` Stop setting Strict-Transport-Securty header from within the app Add filter param for authorized projects for current_user for V4 Improve EE compatibility MR docs [ci skip] Fix the `Gitlab::Seeder` monkey patch to disable mail delivery Use separate error class for cherry-pick and revert tree errors Fix cherry-picking or reverting through an MR Resolve "missing count badge styling in new sidebar dropdown" Fix Rubocop offense in build retry service Decrease tanuki logo size remove extra whitespace on dashboard projects page Changes after review Delete hooks from project with empty repository Only add a newline in Markdown Editor if the current line is not empty Revert "Disallow system notes for closed issuables" Cleaning up navigational order - Project Backport EE changes. Service method should be `get` and not `all` Remove bundle-audit ignores that are no longer applicable ...
\| * \| \| \|	Change the size of CI icon in MR heading [ci skip]	Filipa Lacerda	2017-02-28	2	-1/+6
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into widget-widget-widget-fun	Regis	2017-02-27	1387	-8875/+16972
\| \|\ \ \ \
\| * \| \| \| \|	shape header - bold correct text - border radius - white background for the ↵	Regis	2017-02-17	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rest of widget
* \| \| \| \| \|	Merge branch '19062-relax-font-awesome-rails' into 'master'	Robert Speicher	2017-03-07	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Relax `font-awesome-rails` dependency" Closes #19062 See merge request !9748
\| * \| \| \| \| \|	Update font-awesome-rails to 4.7.0.119062-relax-font-awesome-rails	Rémy Coutable	2017-03-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Relax font-awesome-rails dependency to ~> 4.7	Rémy Coutable	2017-03-07	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '26371-native-emojis-v3' into 'master'	Filipa Lacerda	2017-03-07	1845	-10674/+10599
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569
\| * \ \ \ \ \ \	Merge branch '26371-native-emojis-v3-code' into '26371-native-emojis-v3' 26371-native-emojis-v3	Eric Eastwood	2017-03-06	53	-10674/+10599
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Native Unicode Emojis See merge request !9570
\| \| * \| \| \| \| \| \|	Update changelog26371-native-emojis-v3-code	Eric Eastwood	2017-03-06	1	-0/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix up @DouweM review	Eric Eastwood	2017-03-06	7	-38/+38
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix wrong image src with cached gl-emoji and relative root	Eric Eastwood	2017-03-06	6	-27/+21
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix up potential for build finish event to fire for wrong menu	Eric Eastwood	2017-03-06	2	-5/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix up off index when reading canvas and something failed	Eric Eastwood	2017-03-06	1	-3/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix up emoji not being next to autocomplete label	Eric Eastwood	2017-03-06	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing some preexisting issues (Safari) and some new issues (Windows Firefox)
\| \| * \| \| \| \| \| \|	Fix emoji cut-off line-height	Eric Eastwood	2017-03-06	3	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Maintain emoji line-height in it's context to avoid cut-off, (Windows 10) http://i.imgur.com/xmdOLgv.png This also allows us to get rid of the small bodge for the cut-off in Safari
\| \| * \| \| \| \| \| \|	Fix up `watch` alias lookup in Firefox	Eric Eastwood	2017-03-06	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was pulling https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/watch
\| \| * \| \| \| \| \| \|	Use native unicode emojis	Eric Eastwood	2017-03-06	51	-10643/+10565
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474
\| * \| \| \| \| \| \|	Add emoji images (generated from `rake gemojione:sprite`)	Eric Eastwood	2017-03-06	1792	-0/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'backport-ee-change-webpack-empty-states' into 'master'	Jacob Schatz	2017-03-07	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport change introduced in EE - alias for empty states SVGs See merge request !9683
\| * \| \| \| \| \| \| \|	Backport change introduced in EE - alias for empty states SVGsbackport-ee-change-webpack-empty-states	Filipa Lacerda	2017-03-03	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28598-narrow-environment-payload-by-using-basic-project' into ↵	Rémy Coutable	2017-03-07	4	-3/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Simplify project payload exposed on Environment endpoints in V4 Closes #28598 See merge request !9675
\| * \| \| \| \| \| \| \| \|	Narrow environment payload by using basic project details resource28598-narrow-environment-payload-by-using-basic-project	Oswaldo Ferreira	2017-03-06	4	-3/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'use-publish-to-post-notifications' into 'master'	Rémy Coutable	2017-03-07	4	-8/+76
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use publish channel to post notifications changes See merge request !9574
\| * \| \| \| \| \| \| \| \|	Use set_key_and_notifyuse-publish-to-post-notifications	Kamil Trzcinski	2017-03-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update notification code	Kamil Trzcinski	2017-03-06	3	-12/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add specs for notifications	Kamil Trzcinski	2017-03-03	2	-1/+55
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add support for Workhorse notifications	Kamil Trzcinski	2017-03-03	3	-6/+23
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '28538-restore-nav-shortcuts' into 'master'	Alfredo Sumaran	2017-03-06	10	-9/+108
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore keyboard shortcuts for "Activity" and "Charts" Closes #28538 See merge request !9680
\| * \| \| \| \| \| \| \| \| \|	Restore keyboard shortcuts for "Activity" and "Charts"	Kushal Pandya	2017-03-06	10	-9/+108
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-carrierwave-db' into 'master'	Douwe Maan	2017-03-06	29	-19/+528
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Record file uploads in the database See merge request !8893