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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 'dz-fix-group-name-dot' into 'master'	Rémy Coutable	2016-11-21	3	-8/+25
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add constraints to group id in routing To prevent 404 when visit page like https://gitlab.com/groups/group.with.dot/activity Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24622 See merge request !7614
\| *	Fix 404 on some group pages when name contains dotdz-fix-group-name-dot	Dmitriy Zaporozhets	2016-11-21	3	-8/+25
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'create-pipeline-endpoint' into 'master'	Rémy Coutable	2016-11-21	4	-0/+117
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
\| * \|	Add api endpoint for creating a pipeline	Ido Leibovich	2016-11-18	4	-0/+117
\| \| \| \| \| \| \| \| \| \| \| \|	Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
* \| \|	Merge branch 'issue_5541' into 'master'	Sean McGivern	2016-11-21	11	-32/+92
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
\| * \| \|	Allow enabling and disabling commit and MR events for JIRAissue_5541	Felipe Artur	2016-11-18	11	-32/+92
\| \| \| \|
* \| \| \|	Merge branch 'remove-unnecessary-self-from-user-model' into 'master'	Rémy Coutable	2016-11-21	2	-54/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary self from user model self keyword nod needed. Code is more clean and understandable. https://github.com/bbatsov/ruby-style-guide#no-self-unless-required See merge request !7551
\| * \| \| \|	Remove unnecessary self from user model	Semyon Pupkov	2016-11-19	2	-54/+57
\| \| \| \| \|
* \| \| \| \|	Merge branch 'use-build-in-broadcast-message-spec' into 'master'	Rémy Coutable	2016-11-21	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use build instead create in BroadcastMessage model spec See merge request !7592
\| * \| \| \|	Use build instead create in BroadcastMessage model spec	Semyon Pupkov	2016-11-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '24627-fix-bad-mr-error-message' into 'master'	Rémy Coutable	2016-11-21	3	-2/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes regression causing an error message to appear when user first enters the Merge Request form. Closes #24627 See merge request !7599
\| * \| \| \| \|	Fix regression in Merge request form	Alex Sanford	2016-11-19	3	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request !7163 caused an error message to appear on the Merge Request form when it was first loaded by the user. This commit fixes that regression bug.
* \| \| \| \| \|	Merge branch 'super-secret-login-upgrade' into 'master'	Fatih Acet	2016-11-19	2	-25/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert signin tab order fix. The history: > 1. @sytses created this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23279 > 2. The fix was submitted here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 > 3. I [made](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867#note_16993324) the same observation you did after it was merged 4. A long discussion about accessibility and UX followed, and we decided to revert all changes (https://gitlab.com/gitlab-org/gitlab-ce/issues/23698). ## Screenshots (if relevant) ![2016-11-17_20.55.22](/uploads/c81b0bbe0cd08747124531778af6273f/2016-11-17_20.55.22.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23698 See merge request !7538
\| * \| \| \| \| \|	Un-un-revert signin tab order fix.super-secret-login-upgrade	Bryce Johnson	2016-11-18	2	-25/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-db-schema' into 'master'	Kamil Trzciński	2016-11-19	1	-3/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate sidekiq throttling parameters Improves `db/schema` after merging https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015. cc @grzesiek @filipa See merge request !7603
\| * \| \| \| \| \| \|	Remove duplicate sidekiq throttling parametersfix-db-schema	Kamil Trzcinski	2016-11-19	1	-3/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-typo-in-gitlab-flow' into 'master'	Achilleas Pipinellis	2016-11-19	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a typo in gitlab_flow.md ('munch'->'much') See merge request !7595
\| * \| \| \| \| \| \|	fix typo in gitlab_flow.md ('munch'->'much')	kkkkkkkk	2016-11-19	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-7' into 'master'	Achilleas Pipinellis	2016-11-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong link Not a big one, just fix a wrong link to internal page. See merge request !7597
\| * \| \| \| \| \| \| \|	Fix wrong link	ebuildy	2016-11-19	1	-1/+1
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master'	Jacob Schatz	2016-11-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken merge request widget spec ## What does this MR do? Converts the invalid es6 syntax of the merge_request_widget_spec which is actually causing the spec not to run through teaspoon ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Get specs working again ## Screenshots (if relevant) None ## 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 - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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? Closes #24673 See merge request !7594
\| * \| \| \| \| \| \| \|	Fix spec24673-broken-test-in-merge_request_widget_spec-js	Clement Ho	2016-11-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '22539-display-folders' into 'master'	Fatih Acet	2016-11-19	43	-329/+2349
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22539 See merge request !7015
\| * \| \| \| \| \| \| \|	Fix test22539-display-folders	Filipa Lacerda	2016-11-19	1	-22/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix broken test	Filipa Lacerda	2016-11-19	2	-7/+22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changes for stop url to path	Filipa Lacerda	2016-11-19	2	-23/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Try to fix tests	Kamil Trzcinski	2016-11-18	1	-4/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Expose stop_path for environment to not construct that in frontend	Kamil Trzcinski	2016-11-18	3	-2/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bring back the `commit_url` as it's used by CycleAnalytics	Kamil Trzcinski	2016-11-18	2	-0/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix broken tests	Filipa Lacerda	2016-11-18	2	-11/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Do not trigger CI [ci skip]	Kamil Trzcinski	2016-11-18	0	-0/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ↵	Kamil Trzcinski	2016-11-18	20	-359/+326
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	22539-display-folders
\| \| * \| \| \| \| \| \| \|	Fix css class	Filipa Lacerda	2016-11-18	2	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove comment from html	Filipa Lacerda	2016-11-18	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Removes unnecessary comments	Filipa Lacerda	2016-11-18	2	-3/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Improvements after review	Filipa Lacerda	2016-11-18	1	-9/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove unused CSS	Filipa Lacerda	2016-11-18	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove slots	Filipa Lacerda	2016-11-18	2	-20/+22
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fixes typo	Filipa Lacerda	2016-11-18	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes unneeded comparision
\| \| * \| \| \| \| \| \| \|	Try to use slots	Filipa Lacerda	2016-11-18	3	-24/+29
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Improve after review	Filipa Lacerda	2016-11-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Improvements after review	Filipa Lacerda	2016-11-17	1	-13/+41
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Adds helper to verify empty object	Filipa Lacerda	2016-11-17	1	-3/+18
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix after review	Filipa Lacerda	2016-11-17	1	-4/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Swaps url for paths in mock data	Filipa Lacerda	2016-11-17	1	-11/+10
\| \| \| \| \| \| \| \| \| \|