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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add documentation and examples for configuring cloud storage for registry ↵custom-registry-storage-docs	DJ Mountney	2016-06-21	1	-2/+73
\| \| \| \|	images.
*	Merge branch '18757-fix' into 'master'	Stan Hu	2016-06-20	2	-14/+52
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fallback to group's owners/masters when a project has none for the "access requested email" ## What does this MR do? From b31c5052f9acf5d9118b2b81b556199279e7ca30: Fallback to group's owners/masters when a project has none A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because of #18757. ## What are the relevant issue numbers? Fixes #18757. ## Does this MR meet the acceptance criteria? - [x] No need for CHANGELOG. - [x] No need for documentation. - [x] No API support added. - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4791
\| *	Fallback to group's owners/masters when a project has none18757-fix	Rémy Coutable	2016-06-20	2	-14/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'markdowner' into 'master'	Jacob Schatz	2016-06-20	9	-11/+148
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	POC: Markdown shortcut buttons ## What does this MR do? Adds markdown shortcut buttons to text area for comments. ## Are there points in the code the reviewer needs to double check? Because changing `textarea.val('something')` kills the natural browser undo stack, I had to implement a custom undo stack using state. You can't use the "undoable" state undo pattern because you need to go back to a previous state regardless of cursor position. The undo also adds an undo history item once you delete stuff or press enter. You can also edit multiple textareas at once and it will keep an undo history for each textarea individually, so the undo state should not collide between textareas. ## Why was this MR needed? It has been requested multiple times and the competition has it. https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 Libraries are available that already implement this functionality but they are enormous and bloaty. I implemented this in very few lines of code and kept it very simple and as minimal as possible. This was also some competitions approach. I believe so as to not include too much JS. Adding extra buttons with new functionality should only need new HTML and no new JS. Only extra complex thing was adding a overridden undo stack, which was made as simple as possible as well. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 ## Screenshots (if relevant) NOTE: One thing you cannot see in this screenshot is that I am pressing <kbd>Cmd</kbd><kbd>Z</kbd> to undo and <kbd>Cmd</kbd><kbd>Shift</kbd><kbd>Z</kbd> to redo which is the undo/redo stack I implemented. <kbd>Ctrl</kbd><kbd>Y</kbd> also works for redo. ![markdown-editor](/uploads/2517bfb1a7b4269da7fcc4003c88b7f6/markdown-editor.gif) cc @dzaporozhets for UI cc @iamphill @alfredo1 for JS review cc @JobV if you like the idea. Fixes: #17185 See merge request !4305
\| * \|	Added text_utility to JS testsmarkdowner	Phil Hughes	2016-06-20	1	-6/+7
\| \| \|
\| * \|	Made markdown buttons work on all markdown textareas	Phil Hughes	2016-06-17	4	-24/+27
\| \| \| \| \| \| \| \| \| \| \| \|	Selecting multiple rows & a list correctly creates the selected text into a list
\| * \|	Improved design	Phil Hughes	2016-06-17	1	-105/+43
\| \| \| \| \| \| \| \| \| \| \| \|	Updated JS to remove undo manager - instead let the browser handle it all
\| * \|	Updated design of markdown buttons	Phil Hughes	2016-06-17	3	-24/+48
\| \| \|
\| * \|	Make tests pass.	Jacob Schatz	2016-06-17	1	-1/+1
\| \| \|
\| * \|	Fix spec issue	Jacob Schatz	2016-06-17	1	-1/+1
\| \| \|
\| * \|	Move buttons to upper right.	Jacob Schatz	2016-06-17	4	-13/+30
\| \| \|
\| * \|	Revert _form file	Jacob Schatz	2016-06-17	1	-2/+3
\| \| \|
\| * \|	Fix syntax error. Remove whitespace	Jacob Schatz	2016-06-17	1	-2/+2
\| \| \|
\| * \|	Proper class jquery selector for `off`.	Jacob Schatz	2016-06-17	1	-1/+1
\| \| \|
\| * \|	No need to add bold for the class selector for removing events	Jacob Schatz	2016-06-17	1	-1/+1
\| \| \|
\| * \|	Remove console.log	Jacob Schatz	2016-06-17	1	-4/+5
\| \| \|
\| * \|	Add undo history once they click the enter or backspace key	Jacob Schatz	2016-06-17	1	-1/+12
\| \| \|
\| * \|	Add redo state	Jacob Schatz	2016-06-17	1	-0/+3
\| \| \|
\| * \|	Overwrite undo history	Jacob Schatz	2016-06-17	3	-5/+51
\| \| \|
\| * \|	Initial markdown ez buttons	Jacob Schatz	2016-06-17	1	-2/+1
\| \| \|
\| * \|	Initial markdown ez buttons	Jacob Schatz	2016-06-17	4	-0/+93
\| \| \|
* \| \|	Merge branch '17949-error-500-on-gitlab-org-when-visiting-pipelines' into ↵	Rémy Coutable	2016-06-20	1	-0/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view ## What does this MR do? Sets a default stage on old `ci_builds`. ## Are there points in the code the reviewer needs to double check? Is the migration acceptable for online execution? ## Why was this MR needed? Old `ci_builds`with no stages cause a regression on the pipelines index view. ## What are the relevant issue numbers? #17949 Blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4680 See merge request !4381
\| * \| \|	Set missing stages on ci builds to 'test' to avoid regressions in the ↵17949-error-500-on-gitlab-org-when-visiting-pipelines	Alejandro Rodríguez	2016-06-20	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pipelines view
* \| \| \|	Merge branch 'patch-1' into 'master'	Stan Hu	2016-06-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Broken instructions. git fetch --all --tags doesn't refresh tags See merge request !4092
\| * \| \| \|	Broken instructions. git fetch --all --tags doesn't refresh tags	fliespl	2016-05-09	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue_12758_2' into 'master'	Yorick Peterse	2016-06-20	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notification_settings:events to schema See merge request !4800
\| * \| \| \| \|	Add notification_settings:events to schemaissue_12758_2	Felipe Artur	2016-06-20	1	-1/+2
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'mr-button-placement' into 'master'	Jacob Schatz	2016-06-20	2	-2/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed placement of close button on merge requests ## What does this MR do? Fixes the order in which the MR buttons appear ## Screenshots (if relevant) ![Screen_Shot_2016-06-18_at_21.41.38](/uploads/66a88ebc287b7c21160af193ee9de54c/Screen_Shot_2016-06-18_at_21.41.38.png) ![Screen_Shot_2016-06-18_at_21.41.44](/uploads/ba8f6776d79f4eb0af7877c3c71fbb54/Screen_Shot_2016-06-18_at_21.41.44.png) See merge request !4778
\| * \| \| \| \|	Fixed mobile stylingmr-button-placement	Phil Hughes	2016-06-20	1	-0/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed placement of close button on merge requests	Phil Hughes	2016-06-18	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-double-query-string-url' into 'master'	Robert Speicher	2016-06-20	2	-2/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix double query string in url This MR should fix the double query string in url that shows up while using the "filter by name .." input on projects list pages and also closes [17743](https://gitlab.com/gitlab-org/gitlab-ce/issues/17743) Closes #17743 See merge request !4480
\| * \| \| \| \|	using request dot path instead	barthc	2016-06-17	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into fix-double-query-string-url	barthc	2016-06-17	1181	-6858/+36154
\| \|\ \ \ \ \
\| * \| \| \| \| \|	fix double query string in url	Bartholomew	2016-06-06	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'pinned-nav-cookie-path' into 'master'	Jacob Schatz	2016-06-20	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set path for pinned nav cookie ## What does this MR do? Sets a path for the pinned nav cookie so it will be present across page reload. Closes #18836 See merge request !4784
\| * \| \| \| \| \| \|	Set path for pinned nav cookiepinned-nav-cookie-path	Phil Hughes	2016-06-20	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'document-environments' into 'master'	Achilleas Pipinellis	2016-06-20	3	-6/+70
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document environments and deployments ## What does this MR do? Adds an introduction to environments and deployments and tweaks the `environments` entry in `.gitlab-ci.yml` documentation. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #18683. ## Screenshots (if relevant) ![image](/uploads/1e3355c543abaf7b358f3c37596b1f0b/image.png) ![image](/uploads/58a51505674bcf605039db46833a8ae6/image.png) /cc @ayufan @axil See merge request !4725
\| * \| \| \| \| \| \| \|	Turn note into normal textdocument-environments	Mark Pundsack	2016-06-16	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Document environments and deployments	Mark Pundsack	2016-06-16	2	-0/+60
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Tweak grammar	Mark Pundsack	2016-06-16	1	-6/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '18697-uniqueness-key-validation' into 'master'	Yorick Peterse	2016-06-20	7	-3/+58
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Duplicated keys adding UNIQUE index to fingerprint See merge request !4787
\| * \| \| \| \| \| \| \| \|	Remove Duplicated keys add UNIQUE index to fingerprint18697-uniqueness-key-validation	Paco Guzman	2016-06-20	7	-3/+58
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2016-06-20	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'18810-nameerror-uninitialized-constant-mail-parsers-addressstruct' into 'master' Avoid autoload issue such as 'Mail::Parsers::AddressStruct' This is mostly a shot in the dark but at least it shouldn't break anything. Fixes #18810. See merge request !4793
\| * \| \| \| \| \| \| \| \|	Avoid autoload issue such as 'Mail::Parsers::AddressStruct'18810-nameerror-uninitialized-constant-mail-parsers-addressstruct	Rémy Coutable	2016-06-20	1	-0/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By eager-loading the Mail gem in the Sidekiq initializer. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'limit-email-diff-size' into 'master'	Robert Speicher	2016-06-20	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit push email diff size Restrict the size of diffs in push emails to 30 lines / 150 KB (whichever is smaller), following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/85. Emails on push can get very large if they contain a lot of files that sneak under the single-file limit. https://gitlab.com/gitlab-org/gitlab-ee/issues/490 See merge request !4566
\| * \| \| \| \| \| \| \| \|	Limit push email diff sizelimit-email-diff-size	Sean McGivern	2016-06-17	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit push email diff size to 30 files or 150 KB, whichever comes first.
* \| \| \| \| \| \| \| \| \|	Merge branch 'dz-admin-tabs-dropdown' into 'master'	Jacob Schatz	2016-06-20	4	-55/+68
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move part of admin area navigation from tabs into settings dropdown Partly fix https://gitlab.com/gitlab-org/gitlab-ce/issues/18799 See merge request !4796
\| * \| \| \| \| \| \| \| \| \|	Put some admin settings in dropdowndz-admin-tabs-dropdown	Dmitriy Zaporozhets	2016-06-20	5	-71/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Move appearance settings as sub tab to application settingsdz-admin-tabs	Dmitriy Zaporozhets	2016-06-20	4	-14/+23
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'grammar-tweaks' into 'master'	Achilleas Pipinellis	2016-06-20	1	-23/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grammar tweaks ## What does this MR do? * Updates grammar in recent CI documentation. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Because grammar. ## What are the relevant issue numbers? Needed because of !4200 and !4201. ## Screenshots (if relevant) See merge request !4772