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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use force: cascade to drop dependent objects on deprecated ci_services tablesh-fix-ci-service-cascade	Stan Hu	2016-09-20	1	-2/+2
\| \| \| \|	Closes #22298
*	Merge branch '22218-fix-note-form-footer' into 'master'	Robert Speicher	2016-09-20	6	-11/+126
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note form hint showing slash commands supported for commits ## What are the relevant issue numbers? Closes #22218 See merge request !6368
\| *	Add a view spec for projects/notes/_form	Rémy Coutable	2016-09-20	2	-16/+36
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Ensure we have a user before checking for their permission in ↵	Rémy Coutable	2016-09-20	2	-0/+70
\| \| \| \| \| \| \| \| \| \| \| \|	Notes::SlashCommandsService Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Fix note form hint showing slash commands supported for commits	Rémy Coutable	2016-09-20	5	-11/+36
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'fix-regression-in-handling-build-updated' into 'master'	Rémy Coutable	2016-09-20	2	-11/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix processing of events when build finished. Update pipeline after processing builds. Otherwise we can get into scenario where pipeline will be marked as running. This solves a quite significant regression in Pipeline processing. Proper fix is to move all this to Sidekiq Worker and process pipeline there. I'll do it after 8.12 release. See merge request !6410
\| * \|	Fix build_updatedfix-regression-in-handling-build-updated	Kamil Trzcinski	2016-09-19	1	-1/+2
\| \| \|
\| * \|	Fix processing of events when build finished.	Kamil Trzcinski	2016-09-19	2	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \|	This solves Pipelines in `running` after all stages do finish.
* \| \|	Merge branch 'order-stages-by-pipeline' into 'master'	Rémy Coutable	2016-09-20	2	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render stages in valid order Currently stages in stages dropdown on builds page are not in valid order. It is important to display stages in other those are defined in the pipeline. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21133 See merge request !6430
\| * \| \|	Render stages in valid order	Kamil Trzcinski	2016-09-20	2	-2/+3
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'feature/github-edit-path' into 'master'	Rémy Coutable	2016-09-20	11	-29/+82
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
\| * \|	add missing spacefeature/github-edit-path	James Lopez	2016-09-20	1	-1/+1
\| \| \|
\| * \|	fix CSS	James Lopez	2016-09-20	1	-1/+1
\| \| \|
\| * \|	fix indent in JS file	James Lopez	2016-09-20	1	-1/+1
\| \| \|
\| * \|	updated example img in docs	James Lopez	2016-09-20	1	-0/+0
\| \| \|
\| * \|	fixes CSS issues and namespace path issue. Also tested in different browsers.	James Lopez	2016-09-20	2	-6/+16
\| \| \|
\| * \|	some UI changes	James Lopez	2016-09-20	2	-15/+8
\| \| \|
\| * \|	few fixes based on MR feedback	James Lopez	2016-09-20	3	-20/+11
\| \| \|
\| * \|	Fix namespace helper - use pluck instead of slower map version.	James Lopez	2016-09-20	1	-1/+1
\| \| \|
\| * \|	modify github import JS and controller so we can now specify a namespace ↵	James Lopez	2016-09-20	11	-28/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and/or name for a project. - Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
* \| \|	Merge branch '22364-rails-cache-redis-connection-pool' into 'master'	Yorick Peterse	2016-09-20	2	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a ConnectionPool for Rails.cache on Sidekiq servers See merge request !6429
\| * \| \|	Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-redis-connection-pool	Paco Guzman	2016-09-20	2	-0/+5
\| \| \| \|
* \| \| \|	Merge branch 'merge-request-push-compare-ui' into 'master'	Jacob Schatz	2016-09-20	6	-48/+99
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Frontend for Merge Request Diff This merge request improves the UX for the merge request diff feature which was recently implemented here (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127). Specifically, it styles various parts of the diff feature to match the designs, it disables comment-related buttons in states where comments are disabled, and it adds a 'Show latest version' button for convenience. ## Are there points in the code the reviewer needs to double check? I could use feedback on this MR's fidelity to the design. ## Why was this MR needed? Neccessary styling improvements for basic UX of this feature, and enabled comment buttons are not functional and thus need to be disabled in certain states. ## Screenshots (if relevant) ![57dd0755f0b14342305909](/uploads/318a44a3bc8b7fc5c9c6ef92ba92e511/57dd0755f0b14342305909.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] 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 you do - 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127 cc: @jschatz1 See merge request !6343
\| * \ \ \	Merge branch 'master' into merge-request-push-compare-ui	Bryce Johnson	2016-09-20	39	-78/+443
\| \|\ \ \ \ \| \| \|/ / /
\| * \| \| \|	Merge branch 'merge-request-push-compare-ui' of ↵	Bryce Johnson	2016-09-20	88	-545/+2159
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into merge-request-push-compare-ui
\| \| * \| \| \|	Fix newlines added to README.	Bryce Johnson	2016-09-19	1	-4/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Switch out comments_disabled for diff_notes_disabled.	Bryce Johnson	2016-09-19	1	-3/+2
\| \| \| \| \| \|
\| \| * \| \| \|	style updates	tauriedavis	2016-09-19	1	-6/+20
\| \| \| \| \| \|
\| \| * \| \| \|	Shush rubocop.	Bryce Johnson	2016-09-19	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Add 'Show latest version' button.	Bryce Johnson	2016-09-19	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Style merge request diff dropdowns & disable comments.	Bryce Johnson	2016-09-19	6	-47/+87
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into merge-request-push-compare-ui	Bryce Johnson	2016-09-17	132	-1035/+1151
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix newlines added to README.	Bryce Johnson	2016-09-15	1	-4/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into merge-request-push-compare-ui	Bryce Johnson	2016-09-15	5	-62/+84
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'merge-request-push-compare-ui' of ↵	Bryce Johnson	2016-09-15	1	-6/+20
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into merge-request-push-compare-ui
\| \| * \| \| \| \| \| \|	style updates	tauriedavis	2016-09-14	1	-6/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Switch out comments_disabled for diff_notes_disabled.	Bryce Johnson	2016-09-15	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into merge-request-push-compare-ui	Bryce Johnson	2016-09-15	5	-2/+16
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Shush rubocop.	Bryce Johnson	2016-09-14	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add 'Show latest version' button.	Bryce Johnson	2016-09-14	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Style merge request diff dropdowns & disable comments.	Bryce Johnson	2016-09-14	6	-47/+87
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'maxiperezc/gitlab-ce-issues_17198' into 'master'	Douwe Maan	2016-09-20	9	-20/+219
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Unsubscribe" link in notification emails that is triggered by anti-virus ## What does this MR do? * The unsubscribe link in an email body only unsubscribes automatically when logged in, otherwise the user is asked for a confirmation. * The unsubscribe link in an email header unsubscribes automatically whether logged in or not. ## Are there points in the code the reviewer needs to double check? This addresses all the comments from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5241, I think! ## Why was this MR needed? People were getting unsubscribed automatically by AV software. ## Screenshot ![Screen_Shot_2016-09-20_at_09.51.30](/uploads/083ee2865f1ad6c08e2ed97f1c4e7d0d/Screen_Shot_2016-09-20_at_09.51.30.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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? Fixes #17198. See merge request !6223
\| * \| \| \| \| \| \| \| \|	Improve the Unsubscribe confirmation page	Rémy Coutable	2016-09-20	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Fix initial implementation to actually render the unsubscribe page	Rémy Coutable	2016-09-20	4	-13/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Fix "Unsubscribe" link in notification emails that is triggered by anti-virus	Maximiliano Perez Coto	2016-09-20	9	-20/+174
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Created a force=true param that will continue with the previous behaviour of the unsubscribe method * Created a filter for not-logged users so they see a unsubsribe confirmation page * Added the List-Unsubscribe header on emails so the email client can display it on top
* \| \| \| \| \| \| \| \|	Merge branch 'commit-notes-jump-to-button-remove' into 'master'	Robert Speicher	2016-09-20	2	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide jump to next discussion button on commit notes ## What are the relevant issue numbers? Closes #22354 See merge request !6428
\| * \| \| \| \| \| \| \| \|	Hide jump to next discussion button on commit notes	Phil Hughes	2016-09-20	2	-1/+3
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #22354
* \| \| \| \| \| \| \| \|	Merge branch 'rs-dry-akismet-service' into 'master'	Rémy Coutable	2016-09-20	1	-27/+16
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce duplication in AkismetService See merge request !6362
\| * \| \| \| \| \| \| \|	Reduce duplication in AkismetServicers-dry-akismet-service	Robert Speicher	2016-09-20	1	-27/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'lfs-support-for-ssh-enabled' into 'master'	Douwe Maan	2016-09-20	13	-8/+250
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS support for ssh enabled ## What does this MR do? This is follow-up after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 which is falsely shown as merged due to: https://gitlab.com/gitlab-org/gitlab-ce/issues/22334 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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 !6413