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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Display slash commands outcome when previewing Markdownadam-separate-slash-commands	Rares Sfirlogea	2017-05-04	28	-133/+785
\| \| \| \| \| \| \| \| \| \|	Remove slash commands from Markdown preview and display their outcome next to the text field. Introduce new "explanation" block to our slash commands DSL. Introduce optional "parse_params" block to slash commands DSL that allows to process a parameter before it is passed to "explanation" or "command" blocks. Pass path for previewing Markdown as "data" attribute instead of setting a variable on "window".
*	Merge branch '31156-environments-vue-service' into 'master'	Phil Hughes	2017-05-04	11	-121/+32
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove service from actions dropdown, stop button and redeploy button Closes #31156 and #31567 See merge request !11068
\| *	Adds off for event hub	Filipa Lacerda	2017-05-04	1	-0/+1
\| \|
\| *	Merge branch 'master' into 31156-environments-vue-service31156-environments-vue-service	Filipa Lacerda	2017-05-03	69	-169/+1445
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (91 commits) Move api lint out of static analysis job Fix project tree saver and fork spec failures Fix lazy error handling of cron parser Use gitlab-workhorse 2.0.0 Revert to real click seeing as that was a bug with only the original branch Fixed issue_sidebar_spec.rb click as true click cannot hit the right element and removed sleep find and match first dropdown before clicking Elaborate on the usage of Spring Note Ghost user and refer to user deletion documentation Fix label creation from issuable for subgroup projects Detect already enabled DeployKeys in EnableDeployKeyService Extract common parts of snippet and blob pages into partial update article date link ldap-ee article from auth index add ldap article and changes from !10299 Fix misaligned buttons in wiki pages Improve pipelines_finder.rb Improve documentation Correct typo in pipelines_spec.rb Avoid using sample ...
\| * \|	Remove service being provided as a prop on environments table	Filipa Lacerda	2017-05-03	2	-11/+6
\| \| \|
\| * \|	Remove service from actions dropdown, stop button and redeploy button	Filipa Lacerda	2017-05-03	10	-117/+32
\| \| \|
* \| \|	Merge branch '12910-uploader-pers-snippet' into 'master'	Sean McGivern	2017-05-04	22	-103/+419
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare uploaders for personal snippets comments See merge request !11022
\| * \| \|	Support uploaders for personal snippets comments12910-uploader-pers-snippet	Jarka Kadlecova	2017-05-02	22	-103/+419
\| \| \| \|
* \| \| \|	Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'	Rémy Coutable	2017-05-04	13	-48/+145
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable navigation to Pages config if Pages is disabled Closes #30529 See merge request !11008
\| * \| \| \|	Disable navigation to Pages config if Pages is disabled	Mark Fletcher	2017-05-04	13	-48/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Regards project-level pages config - Nav link is now shown only if Pages is enabled for instance - Navigation to following controllers denied if Pages disabled: * projects/pages_controller * projects/pages_domains_controller - 'disabled' partial removed + Test for pages_controller introduced
* \| \| \| \|	Merge branch 'always-show-latest-pipeline-in-commit-box' into 'master'	Kamil Trzciński	2017-05-04	4	-13/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always show latest pipeline info in commit box Closes #31378 See merge request !11038
\| * \| \| \| \|	Rename latest_pipeline to last_pipelinealways-show-latest-pipeline-in-commit-box	Lin Jen-Shin	2017-05-03	3	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As it might be confusing that it's not the same as Pipeline#latest Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11038#note_28677090
\| * \| \| \| \|	Always show latest pipeline info in commit box	Lin Jen-Shin	2017-05-03	3	-9/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵	Sean McGivern	2017-05-04	4	-5/+58
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Handle incoming emails from aliases correctly See merge request !11079
\| * \| \| \| \| \|	Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-come	Sean McGivern	2017-05-03	4	-5/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These set the 'actual' destination email in one of the Delivered-To lines, so check those too.
* \| \| \| \| \| \|	Merge branch 'zj-chat-message-pretty-time' into 'master'	Sean McGivern	2017-05-04	4	-16/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert seconds to minutes and hours on chat notifations See merge request !11054
\| * \| \| \| \| \| \|	Convert seconds to minutes and hours on chat notifationszj-chat-message-pretty-time	Z.J. van de Weg	2017-05-04	4	-16/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the pipeline message, the duration of the pipeline was shown as: > gitlab-org/gitlab-ee: Pipeline #8002259 of master branch by Douwe Maan failed in 8612 seconds But this many seconds only gave me a clue how long the pipeline took, so now this will be shown as something like: 02:20:12 which gives a much better measure of time.
* \| \| \| \| \| \| \|	Merge branch '28558-create-new-branch-from-issue-page' into 'master'	Phil Hughes	2017-05-04	22	-133/+730
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to create new branch and empty WIP merge request from issue page See merge request !10018
\| * \| \| \| \| \| \| \|	Allow to create new branch and empty WIP merge request from issue page	Alfredo Sumaran	2017-05-04	22	-133/+730
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '31647-fix-snippet-content_html' into 'master'	Rémy Coutable	2017-05-04	6	-1/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix caching large snippet HTML content on MySQL databases Closes #31647 See merge request !11024
\| * \| \| \| \| \| \| \|	Fix caching large snippet HTML content on MySQL databases	Nick Thomas	2017-05-03	6	-1/+23
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '31544-size-of-project-from-api' into 'master'	Rémy Coutable	2017-05-04	4	-8/+53
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Size of project from API" Closes #31544 See merge request !11013
\| * \| \| \| \| \| \| \|	Expose project statistics on single requests via the API	Mark Fletcher	2017-05-03	4	-6/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ The statistics parameter was already accepted * This commit ensure that it is respected for GET /projects/:id endpoint + Add documentation of the parameter and update the example response for stats
\| * \| \| \| \| \| \| \|	Update Projects API documentation to include statistics parameter	Mark Fletcher	2017-05-01	1	-2/+17
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Only supported for the GET /projects endpoint
* \| \| \| \| \| \| \|	Merge branch '31064-update-docs-todos' into 'master'	Achilleas Pipinellis	2017-05-04	2	-0/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update todos screenshots Closes #31064 See merge request !11081
\| * \| \| \| \| \| \| \|	Update todos screenshots31064-update-docs-todos	Annabel Dunstone Gray	2017-05-03	2	-0/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵	Douwe Maan	2017-05-03	4	-47/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' removes the possibility of commit messages having carriage returns Closes #31671 See merge request !11077
\| * \| \| \| \| \| \| \| \|	removes the possibility of commit messages having carriage returns	Tiago Botelho	2017-05-03	4	-47/+46
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-artifact-browser-header' into 'master'	Robert Speicher	2017-05-03	12	-42/+73
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add breadcrumb, build header and pipelines submenu to artifacts browser See merge request !11050
\| * \| \| \| \| \| \| \| \| \|	Add breadcrumb, build header and pipelines submenu to artifacts browser	Douwe Maan	2017-05-03	12	-42/+73
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'	Sean McGivern	2017-05-03	23	-107/+532
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388
\| * \| \| \| \| \| \| \| \| \|	Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diff	Douwe Maan	2017-05-03	23	-107/+532
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	versions
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-blob-external-storage' into 'master'	Sean McGivern	2017-05-03	12	-104/+308
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048
\| * \| \| \| \| \| \| \| \| \|	Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storage	Douwe Maan	2017-05-03	12	-104/+308
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'further-attempt-to-fix-protected_tags_spec' into 'master'	Sean McGivern	2017-05-03	3	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try waiting for previous dropdown to definitly close before going to click See merge request !11070
\| * \| \| \| \| \| \| \| \| \|	remove debug codefurther-attempt-to-fix-protected_tags_spec	Luke "Jared" Bennett	2017-05-03	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Try waiting for previous dropdown to definitly close before going to click	Luke "Jared" Bennett	2017-05-03	3	-4/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '30458-real-time-note-edits' into 'master'	Jacob Schatz	2017-05-03	9	-131/+320
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add real-time note edits :chipmunk: Closes #30458 See merge request !10837
\| * \| \| \| \| \| \| \| \| \|	Add real-time note edits :chipmunk:	Eric Eastwood	2017-05-03	9	-131/+320
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/move-api-lint-to-docs-link-job' into 'master'	Rémy Coutable	2017-05-03	2	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move api lint out of static analysis job See merge request !11046
\| * \| \| \| \| \| \| \| \| \|	Move api lint out of static analysis job	Achilleas Pipinellis	2017-05-03	2	-2/+6
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/project-tree-saver-spec' into 'master'	Rémy Coutable	2017-05-03	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project tree saver and fork spec failures Closes #31746 See merge request !11076
\| * \| \| \| \| \| \| \| \| \|	Fix project tree saver and fork spec failures	James Lopez	2017-05-03	2	-2/+3
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '26883-members-page-layout-looks-broken' into 'master'	Annabel Dunstone Gray	2017-05-03	4	-4/+68
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added UX improvements to the project members settings view Closes #26883 See merge request !8650
\| * \| \| \| \| \| \| \| \|	Added flex wrapping26883-members-page-layout-looks-broken	Jose Ivan Vargas	2017-04-24	3	-10/+55
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added a media query when there's a more width available to show more of the ↵	Jose Ivan Vargas	2017-04-24	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	title
\| * \| \| \| \| \| \| \| \|	Changed the way to truncate the panel to title from ruby to a scss mixin	Jose Ivan Vargas	2017-04-24	3	-2/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added a description for non project masters or owners for the members ↵	Jose Ivan Vargas	2017-04-24	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	settings page Truncated the project name if it exceeds 18 characters
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/31692-elaborate-on-spring-instructions' into 'master'	Achilleas Pipinellis	2017-05-03	1	-6/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Elaborate on the usage of Spring See merge request !11058
\| * \| \| \| \| \| \| \| \| \|	Elaborate on the usage of Springdocs/31692-elaborate-on-spring-instructions	Rémy Coutable	2017-05-03	1	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>