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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 8.15.0-prev8.15.0.pre	Alejandro Rodríguez	2016-11-22	1	-1/+1
\|
*	Update CHANGELOG.md for 8.14.0	Alejandro Rodríguez	2016-11-22	118	-471/+125
\| \| \|	[ci skip]
*	Merge branch 'fix-encoding' into 'master'	Rémy Coutable	2016-11-22	1	-1/+1
\|\ \| \| \| \|	See merge request !7676
\| *	[ci skip] Fix encoding on unreleased changelog entry	Alejandro Rodríguez	2016-11-22	1	-1/+1
\| \|
* \|	Merge branch 'fix/cycle-analytics-duration' into 'master'	James Lopez	2016-11-22	3	-3/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed bug to do with calculating durations Fixes a couple of small bugs while calculating durations in cycle analytics - probably due to some bad refactoring - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [ ] 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? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24796 See merge request !7663
\| * \|	fix rubocop warningfix/cycle-analytics-duration	James Lopez	2016-11-22	1	-1/+1
\| \| \|
\| * \|	fixed bug to do with calculating durations	James Lopez	2016-11-22	3	-3/+11
\| \| \|
* \| \|	Merge branch ↵	Kamil Trzciński	2016-11-22	2	-1/+5
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update' into 'master' Resolve "Wrong `render 'index'`, should be `render 'show'` in `Projects::PipelinesSettingsController#update`" Closes #24804 See merge request !7665
\| * \|	Fix wrong template rendered when CI/CD settings aren't update successfully	Rémy Coutable	2016-11-22	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'fix-unreleased-changelog' into 'master'	Rémy Coutable	2016-11-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	See merge request !7672
\| * \| \|	[ci skip] Fix unreleased changelog	Alejandro Rodríguez	2016-11-22	1	-1/+1
\|/ / /
* \| \|	Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master'	Kamil Trzciński	2016-11-22	2	-2/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue creation now accepts trailing whitespace See merge request !7633
\| * \| \|	Issue creation now accepts trailing whitespacezj-fix-trailing-whitespace-issue-create	Z.J. van de Weg	2016-11-22	2	-2/+13
\| \| \| \|
* \| \| \|	Merge branch 'rs-project-team-helpers' into 'master'	Sean McGivern	2016-11-22	7	-62/+90
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add shortcuts for adding users to a project team with a specific role Closes #20944 See merge request !7565
\| * \| \| \|	Add shortcuts for adding users to a project team with a specific rolers-project-team-helpers	Robert Speicher	2016-11-18	7	-62/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also updates _some_ specs to use these new methods, just to serve as an example for others going forward, but by no means is this exhaustive. Original implementations at !5992 and !6012. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20944
* \| \| \| \|	Merge branch 'hot-fix-define-pipeline-vars' into 'master'	Rémy Coutable	2016-11-22	1	-5/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not use MergeRequest#commits in define_pipelines_vars ## What does this MR do? `MergeRequest#commits` requires merge_request_diff to be present. This is not the case when creating a new merge request. ## What are the relevant issue numbers? Fix up for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7568 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24798 See merge request !7664
\| * \| \| \| \|	Do not use MergeRequest#commits in define_pipelines_varshot-fix-define-pipeline-vars	Adam Niedzielski	2016-11-22	1	-5/+2
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequest#commits requires merge_request_diff to be present. This is not the case when creating a new merge request.
* \| \| \| \|	Merge branch '24576_cant_stop_impersonating' into 'master'	Sean McGivern	2016-11-22	3	-8/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admins to stop impersonating users without e-mail addresses Closes #24576 See merge request !7550
\| * \| \| \| \|	Allow admins to stop impersonating users without e-mail addresses	Oren Kanner	2016-11-17	3	-8/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves #24576 Modify the guard clause of the `ApplicationController#require_email` before action to skip requests where an admin is impersonating the current user.
* \| \| \| \| \|	Merge branch 'fix-api-iid-filter' into 'master'	Rémy Coutable	2016-11-22	6	-7/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IID filter for merge requests and milestones I updated the example in the docs and added a test. The milestones API was also broken for the same reason. Related to !7358 and !7373 See merge request !7648
\| * \| \| \| \| \|	Document both valid cases for API iid filterfix-api-iid-filter	Robert Schilling	2016-11-22	2	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix IID filter for merge requests and milestones	Robert Schilling	2016-11-22	6	-9/+26
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-remove-undeleted-groups-orphans' into 'master'	Rémy Coutable	2016-11-22	1	-0/+41
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle orphans when removing soft deleted groups This fixes the migration from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7528 so it handles orphans as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7528/diffs#note_18800962. This needs to go in 8.14.0 as otherwise customers may run into the same problem. See merge request !7657
\| * \| \| \| \| \| \|	Handle orphans when removing soft deleted groupsfix-remove-undeleted-groups-orphans	Yorick Peterse	2016-11-22	1	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There may be more tables but these were the tables that were problematic for GitLab.com due to foreign key constraints (without cascading deletes).
* \| \| \| \| \| \| \|	Merge branch 'docs/cycle-analytics-new-image' into 'master'	Achilleas Pipinellis	2016-11-22	2	-6/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new image for Cycle Analytics See merge request !7666
\| * \| \| \| \| \| \| \|	Add new image for Cycle Analytics	Achilleas Pipinellis	2016-11-22	2	-6/+3
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2016-11-22	8	-12/+46
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'23532-define-common-helper-for-describe-pagination-params-in-api' into 'master' Add concern for reuse pagination params declaration in API Closes #23532 See merge request !7646
\| * \| \| \| \| \| \|	Define common helper for describe pagination params in api	Semyon Pupkov	2016-11-22	8	-12/+46
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'revert-a0d5bb0b' into 'master'	Achilleas Pipinellis	2016-11-22	28	-123/+81
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'docs/jira-old' into 'master'" See merge request !7531
\| * \| \| \| \| \| \|	Change documentation link in JIRA servicerevert-a0d5bb0b	Achilleas Pipinellis	2016-11-22	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor JIRA docs and bring back some old information	Achilleas Pipinellis	2016-11-22	2	-94/+101
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move JIRA service doc back to its old location	Achilleas Pipinellis	2016-11-22	18	-203/+202
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add remove links to JIRA documentation	Felipe Artur	2016-11-22	4	-2/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert "Merge branch 'docs/jira-old' into 'master'"	Achilleas Pipinellis	2016-11-22	23	-249/+198
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !7365
* \| \| \| \| \| \|	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