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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add nested groups support to the routingdz-allow-nested-group-routing	Dmitriy Zaporozhets	2016-11-23	30	-755/+904
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'fix-folders-css' into 'master' 24798-actionview-template-error-undefined-method-failed-for-nil-nilclass	Fatih Acet	2016-11-22	2	-6/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve readability of environments table ## What does this MR do? Fix the environments table columns width ## Before ![Screen_Shot_2016-11-21_at_18.13.00](/uploads/1771b0546eb3cb15f4894b719fd44286/Screen_Shot_2016-11-21_at_18.13.00.png) ## After ![Screen_Shot_2016-11-21_at_18.11.18](/uploads/a20194a055b6ec0f7989f0c1499883d3/Screen_Shot_2016-11-21_at_18.11.18.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7628
\| *	Adjust %fix-folders-css	Filipa Lacerda	2016-11-22	1	-2/+2
\| \|
\| *	Improvements for mobile	Filipa Lacerda	2016-11-22	1	-3/+13
\| \|
\| *	Improve readability of environments table	Filipa Lacerda	2016-11-21	2	-6/+21
\| \|
* \|	Merge branch 'zj-mattermost-command-help-message' into 'master'	Fatih Acet	2016-11-22	11	-59/+256
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add help section for MM commands ## What should this MR do Check @pedroms' design for the Mattermost service screen: https://gitlab.com/gitlab-org/gitlab-ce/issues/22540 Now this has to be implemented, I've created a clean canvas for you, @lbennett, to draw on. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - 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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7558
\| * \|	Frontend review changeszj-mattermost-command-help-message	Luke "Jared" Bennett	2016-11-21	4	-84/+90
\| \| \|
\| * \|	Improve the mattermost help box	Z.J. van de Weg	2016-11-21	5	-13/+58
\| \| \| \| \| \| \| \| \| \| \| \|	Also added tests, and moved the slack test to a better location.
\| * \|	Pass @service using subject	Luke "Jared" Bennett	2016-11-21	4	-4/+4
\| \| \|
\| * \|	Added new .help-form styling and implemented with mattermost command service ↵	Luke "Jared" Bennett	2016-11-21	7	-16/+157
\| \| \| \| \| \| \| \| \| \| \| \|	help well
\| * \|	Add framework for rendering partials	Z.J. van de Weg	2016-11-21	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'fix-failed-email-for-external-jobs' into 'master'	Kamil Trzciński	2016-11-22	8	-9/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	External jobs do not have show page nor traces Fixes #24677 See merge request !7617
\| * \| \|	Move partials to links directory, feedback:fix-failed-email-for-external-jobs	Lin Jen-Shin	2016-11-22	6	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762971
\| * \| \|	Just create failed builds rather than calling events	Lin Jen-Shin	2016-11-22	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18763033
\| * \| \|	Move has_trace? to CommitStatus than GenericCommitStatus	Lin Jen-Shin	2016-11-22	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762721
\| * \| \|	Use local instead of instance variable in partial	Lin Jen-Shin	2016-11-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762989
\| * \| \|	Use partials instead of simple switch case:	Lin Jen-Shin	2016-11-22	6	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745137
\| * \| \|	Use has_trace? instead of case switch, feedback:	Lin Jen-Shin	2016-11-21	3	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745170 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745221
\| * \| \|	External jobs do not have show page nor traces	Lin Jen-Shin	2016-11-21	3	-6/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #24677
* \| \| \|	Merge branch 'avoid-api-helper-call' into 'master'	Rémy Coutable	2016-11-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid helper call with default parameters The helpers can ultimately be removed when the issue API uses the Grape DSL. See merge request !7649
\| * \| \| \|	Avoid helper call with default parametersavoid-api-helper-call	Robert Schilling	2016-11-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ux-guide-update-mr-copy' into 'master'	Achilleas Pipinellis	2016-11-22	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Approve and Remove approval to UX Guide terminology table Updating UX Guide page on terminology to include guidance on 'Approve' and 'Remove approval'. See merge request !7632
\| * \| \| \| \|	[ci skip] Add Approve and Remove Approval to UX Guide terminology tableux-guide-update-mr-copy	awhildy	2016-11-21	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-11-22	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed manage_large_binaries_with_git_lfs.md typo See merge request !7612
\| * \| \| \| \| \|	fixed manage_large_binaries_with_git_lfs.md typo	Ján Dzurek	2016-11-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-10' into 'master'	Achilleas Pipinellis	2016-11-22	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add missing sudo skip-auto-migration ## What does this MR do? Fixes minor documentation issue where adding `skip-auto-migration` file does not work because `sudo` is not used. See merge request !7435
\| * \| \| \| \| \| \|	add missing sudo skip-auto-migration	Ben Bodenmiller	2016-11-12	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-9' into 'master'	Achilleas Pipinellis	2016-11-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change docker backup command in readme See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html ## What does this MR do? MR fixes wrong order of parameters in the command given for backing up gitlab in a docker container ## Moving docs to a new location? No See merge request !7468
\| * \| \| \| \| \| \| \|	Change docker backup command in readme	Benjamin Weber	2016-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/pipelines-add-img' into 'master'	Achilleas Pipinellis	2016-11-22	2	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add example image to pipelines docs See merge request !7652
\| * \| \| \| \| \| \| \| \|	Add example image to pipelines docs	Achilleas Pipinellis	2016-11-22	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24767 [ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'object-state-models-docs' into 'master'	Achilleas Pipinellis	2016-11-22	5	-0/+26
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Object state models docs Object state models docs for issues and merge requests. This is to start documenting object models, focused more on users and how they experience the product. See merge request !7544
\| * \| \| \| \| \| \| \| \|	Remove contents section since it's not necessary [ci skip]object-state-models-docs	Victor Wu	2016-11-20	1	-7/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove hyphen [ci skip]	Victor Wu	2016-11-18	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove hyphen [ci skip]	Victor Wu	2016-11-18	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add spaces to conform to style guide [ci skip]	Victor Wu	2016-11-18	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update object_state_models.md [ci skip]	Victor Wu	2016-11-17	1	-0/+27
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Delete .gitkeep [ci skip]	Victor Wu	2016-11-17	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Upload new file [ci skip]	Victor Wu	2016-11-17	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Upload new file [ci skip]	Victor Wu	2016-11-17	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Upload new file [ci skip]	Victor Wu	2016-11-17	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add new directory [ci skip]	Victor Wu	2016-11-17	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add file [ci skip]	Victor Wu	2016-11-17	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Link to object state models [ci skip]	Victor Wu	2016-11-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-slash-command-docs' into 'master'	Achilleas Pipinellis	2016-11-22	12	-0/+158
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs on Mattermost commands Still needs some screenshots, depends on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7558 /cc @ayufan @SeanPackham See merge request !7567
\| * \| \| \| \| \| \| \| \| \|	Restructure steps for MM slash commands service	Achilleas Pipinellis	2016-11-22	5	-35/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Refactor Mattermost slash commands docszj-slash-command-docs	Achilleas Pipinellis	2016-11-21	11	-24/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Add screenshot in docs	Z.J. van de Weg	2016-11-21	3	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Add framework for docs on Mattermost commands	Z.J. van de Weg	2016-11-21	3	-0/+43
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'preserve-second-parameter-new-note-worker' into 'master'	Sean McGivern	2016-11-22	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preserve optional second parameter in NewNoteWorker jobs Closes #24678 See merge request !7602