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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-module	Phil Hughes	2017-12-18	12	-417/+435
\|\ \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/main.js
\| *	Merge branch 'ph-even-more-es-modules' into 'master'	Filipa Lacerda	2017-12-18	9	-363/+358
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Exported JS classes as modules See merge request gitlab-org/gitlab-ce!15960
\| \| *	Exported JS classes as modulesph-even-more-es-modules	Phil Hughes	2017-12-15	9	-363/+358
\| \| \|
\| * \|	Merge branch '38019-hide-runner-token' into 'master'	Clement Ho	2017-12-15	3	-41/+54
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide runner token in CI/CD settings page Closes #38019 See merge request gitlab-org/gitlab-ce!15918
\| \| * \|	Hide runner token in CI/CD settings page38019-hide-runner-token	Eric Eastwood	2017-12-15	3	-41/+54
\| \| \|/ \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38019
\| * \|	Merge branch '38239-update-toggle-design' into 'master'	Filipa Lacerda	2017-12-15	1	-13/+23
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Update feature toggle design to use icons and make it i18n friendly Closes #38239 See merge request gitlab-org/gitlab-ce!15904
\| \| *	Use icons instead of string labels for toggles	Kushal Pandya	2017-12-15	1	-13/+23
\| \| \|
* \| \|	Export and use Notes ES module	Phil Hughes	2017-12-15	5	-8/+14
\|/ /
* \|	Merge branch 'ph-more-es-modules' into 'master'	Filipa Lacerda	2017-12-15	9	-492/+463
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Export JS classes as modules See merge request gitlab-org/gitlab-ce!15952
\| * \|	Export JS classes as modulesph-more-es-modules	Phil Hughes	2017-12-15	9	-492/+463
\| \| \| \| \| \| \| \| \| \| \| \|	#38869
* \| \|	Merge branch '38541-cancel-alignment' into 'master'	Filipa Lacerda	2017-12-15	1	-6/+13
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix button alignment on MWPS component Closes #38541 See merge request gitlab-org/gitlab-ce!15835
\| * \|	fix button alignment on MWPS component38541-cancel-alignment	Simon Knox	2017-12-11	1	-6/+13
\| \| \|
* \| \|	Converted JS modules into exported modulesph-es-modules	Phil Hughes	2017-12-14	6	-97/+65
\| \| \|
* \| \|	Merge branch '38869-datetime' into 'master'	Tim Zallmann	2017-12-14	19	-133/+152
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Export date utility functions as ES6 modules See merge request gitlab-org/gitlab-ce!15782
\| * \| \|	Fixes after review38869-datetime	Filipa Lacerda	2017-12-13	1	-3/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into 38869-datetime	Filipa Lacerda	2017-12-13	31	-792/+855
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (85 commits) Export old code into es6 modules Use relative URL for projects to avoid storing domains Fix spec by avoiding monkeypatching Return the noteable in Note#touch_noteable add CHANGELOG.md entry for !15889 fix broken empty state assets for environment monitoring page removed tab indexes from tag form Refactor entrypoint override docs Present member collection at the controller level Adds i18n check the import_status field before doing SQL operations to check the import url Fix rubocop offence Fix entrypoint overriding documentation Remove unnecessary js-issuable-edit Use memoization for commits on diffs Move Repository#write_ref to Git::Repository#write_ref Treat empty markdown and html strings as valid cached text, not missing cache that needs to be updated Center cluster title Remove noisy notification from QA base page Remove unused page from hashed storage QA scenario ...
\| * \ \ \	Merge branch 'master' into 38869-datetime	Filipa Lacerda	2017-12-11	57	-357/+568
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (112 commits) small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc Improve down step of removing issues.assignee_id column Fix specs after removing assignee_id field Remove issues.assignee_id column Resolve conflicts in app/models/user.rb Fix image view mode Do not raise when downstream pipeline is created Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Remove allocation tracking code from InfluxDB sampler for performance ...
\| * \ \ \ \	Merge branch 'master' into 38869-datetime	Filipa Lacerda	2017-12-07	6	-94/+158
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (82 commits) Docs: add EEU tier to the landing page CE backport of ProtectedBranches API changes Support uploads for groups Update pipeline create chain Prometheus metric Don't set timeago title to what was already there. Resolve "Display member role per project" The API isn't using the appropriate services for managing forks Add chevron to create dropdown on repository page Rename GKE as Kubernetes Engine Fix specs for MySQL Fix broken tests Refactor banzai to support referencing from group context Fix specs after rebase Prevent dups when using StringIO for binary reads Bump redis-rails to 5.0.2 to get redis-store security updates add note on deploying Pages to a private network Bump GITLAB_SHELL_VERSION Updates the dropdown to match the docs and remove old hack of stop event propagation Move invalid builds counter out of the transaction Add invalid builds counter metric to stage seeds class ...
\| * \| \| \| \| \|	Export date utility functions as ES6 modules	Filipa Lacerda	2017-12-07	19	-136/+157
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue-description-field-typo' into 'master'	Fatih Acet	2017-12-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected typo in quick action data attribute Closes #41035 See merge request gitlab-org/gitlab-ce!15872
\| * \ \ \ \ \ \	Merge branch 'master' into issue-description-field-typo	Marcus Amargi	2017-12-12	18	-105/+176
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	corrected typo in quick action data attribute	Marcus Amargi	2017-12-11	1	-1/+1
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'winh-unify-modals' into 'master'	Filipa Lacerda	2017-12-13	10	-44/+44
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify dialog modal/popup dialog/confirmation dialog/modal to modal See merge request gitlab-org/gitlab-ce!15865
\| * \| \| \| \| \| \|	Rename recaptcha-dialog to recaptcha-modal	Winnie Hellmann	2017-12-12	4	-12/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename popup-dialog to modal	Winnie Hellmann	2017-12-12	7	-32/+32
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch '33926-update-issuable-icons' into 'master'	Annabel Dunstone Gray	2017-12-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update issuable status icons Closes #33926 See merge request gitlab-org/gitlab-ce!15898
\| * \| \| \| \| \| \|	Update issuable status icons33926-update-issuable-icons	Eric Eastwood	2017-12-13	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* \| \| \| \| \| \|	Merge branch 'new-nav-tech-debt' into 'master'	Phil Hughes	2017-12-13	4	-8/+8
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove page-with-new-nav class See merge request gitlab-org/gitlab-ce!15819
\| * \| \| \| \| \|	Rename page-with-sidebar to layout-pagenew-nav-tech-debt	Annabel Dunstone Gray	2017-12-08	4	-8/+8
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Export old code into es6 modules	Filipa Lacerda	2017-12-13	11	-666/+650
\| \| \| \| \| \|
* \| \| \| \| \|	Adds i18n40468-empty-states	Filipa Lacerda	2017-12-12	2	-4/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into 40468-empty-states	Filipa Lacerda	2017-12-12	49	-236/+303
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (54 commits) Updated image for diff navigation docs Milestone sidebar docs Use app host instead of asset host when rendering image blob or diff ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build Use shared interceptor in note specs Ignore temporary table in schema Check for null in job tooltip title Clarify casing of I18N placeholder names fixes some markup issues in the js style guide docs Fix migration that removes issues.branch_name small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc ...
\| * \| \| \| \|	Merge branch 'add-js-prefix-issuable-edit' into 'master'	Filipa Lacerda	2017-12-12	2	-2/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add js prefix for issuable-edit Closes #40965 See merge request gitlab-org/gitlab-ce!15813
\| \| * \| \| \| \|	Add js prefix for issuable-editadd-js-prefix-issuable-edit	Clement Ho	2017-12-08	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'	Filipa Lacerda	2017-12-12	1	-3/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop "ERROR: TypeError{}" from being logged to the console and fail tests Closes #37619 See merge request gitlab-org/gitlab-ce!15830
\| \| * \| \| \| \| \|	Try to clean up legit Vue error that was patched over	Eric Eastwood	2017-12-10	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
\| * \| \| \| \| \| \|	Merge branch '40997-pipeline-null' into 'master'	Phil Hughes	2017-12-12	1	-11/+30
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checks for null in job tooltip title Closes #40997 See merge request gitlab-org/gitlab-ce!15869
\| \| * \| \| \| \| \| \|	Check for null in job tooltip title40997-pipeline-null	Filipa Lacerda	2017-12-11	1	-11/+30
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'	Tim Zallmann	2017-12-12	1	-5/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comment on image discussion icon alignment (update icons) Closes #39608 See merge request gitlab-org/gitlab-ce!15760
\| \| * \| \| \| \| \| \|	Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignment	Eric Eastwood	2017-12-08	1	-5/+2
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39608 Use SVG icons to avoid having to position things See https://gitlab.com/gitlab-org/gitlab-ce/issues/39608#note_50088917
\| * \| \| \| \| \| \|	Merge branch 'issue-note-rename' into 'master'	Fatih Acet	2017-12-11	7	-27/+27
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename remaining issue_ prefixed files See merge request gitlab-org/gitlab-ce!15818
\| \| * \| \| \| \| \| \|	rename remaining issue_ prefixed filesissue-note-rename	Simon Knox	2017-12-09	7	-27/+27
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'backport-epic-in-issue' into 'master'	Jacob Schatz	2017-12-11	7	-57/+114
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport epic in issue See merge request gitlab-org/gitlab-ce!15799
\| \| * \| \| \| \| \|	Backport epic in issueepic-in-issue backport-epic-in-issue	Clement Ho	2017-12-07	7	-57/+114
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'url-utility-es-module' into 'master'	Filipa Lacerda	2017-12-11	31	-125/+120
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783
\| \| * \| \| \| \| \| \|	updated importsurl-utility-es-module	Phil Hughes	2017-12-11	14	-29/+29
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into 'url-utility-es-module'	Phil Hughes	2017-12-11	17	-166/+411
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issue_show/components/app.vue
\| \| * \| \| \| \| \| \| \|	fixed URL being undefined :face_palm:	Phil Hughes	2017-12-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	use exported methods instead of gl.utils	Phil Hughes	2017-12-08	31	-68/+74
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Moved URL utility methods into es modules	Phil Hughes	2017-12-08	1	-69/+58
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|