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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change a bunch of doc links to either relative or https://docs.gitlab.com.fix-docs-links	Connor Shea	2016-11-03	6	-33/+34
\|
*	Merge branch '24133-custom-signin-text-alignment' into 'master'	Fatih Acet	2016-11-03	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add custom text to column Before: ![Screen_Shot_2016-11-03_at_9.46.27_AM](/uploads/ba26761b1e1a5af30b19aac88c0060a1/Screen_Shot_2016-11-03_at_9.46.27_AM.png) After: ![Screen_Shot_2016-11-03_at_9.46.20_AM](/uploads/a959a30a3e11ab64bb1412e662692f2b/Screen_Shot_2016-11-03_at_9.46.20_AM.png) Closes #24133 See merge request !7269
\| *	Add custom text to column24133-custom-signin-text-alignment	Annabel Dunstone Gray	2016-11-03	1	-2/+2
\| \|
* \|	Merge branch 'build-status-focus-state' into 'master'	Alfredo Sumaran	2016-11-03	2	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove underline focus state on statuses Before: ![Screen_Shot_2016-11-02_at_9.21.03_AM](/uploads/60d49c0cde418b45ee245d1a60d6ece7/Screen_Shot_2016-11-02_at_9.21.03_AM.png) After: ![Screen_Shot_2016-11-02_at_9.20.43_AM](/uploads/820c91d961b01d775465671ebceeba98/Screen_Shot_2016-11-02_at_9.20.43_AM.png) See merge request !7244
\| * \|	Remove underline focus state on statusesbuild-status-focus-state	Annabel Dunstone Gray	2016-11-03	2	-1/+7
\| \|/
* \|	Merge branch 'rs-changelog-spec-dry' into 'master'	Robert Speicher	2016-11-03	1	-36/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DRY up the bin/changelog specs Depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7252 See merge request !7253
\| * \|	DRY up the specs for bin/changelogrs-changelog-spec-dry	Robert Speicher	2016-11-03	1	-36/+20
\| \|/
* \|	Merge branch ↵	Sean McGivern	2016-11-03	4	-3/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24102-cannot-unselect-remove-source-branch-when-editing-merge-request' into 'master' Fixes #24102 See merge request !7267
\| * \|	Ensure merge request's "remove branch" accessors return booleans24102-cannot-unselect-remove-source-branch-when-editing-merge-request	Rémy Coutable	2016-11-03	4	-3/+20
\| \|/ \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'update-templates-8-14' into 'master'	Rémy Coutable	2016-11-03	16	-140/+247
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add and update .gitignore & .gitlab-ci.yml templates for 8.14 Following https://gitlab.com/gitlab-org/gitlab-ce/issues/24134 See merge request !7272
\| * \|	Add and update .gitignore & .gitlab-ci.yml templates for 8.14	Alejandro Rodríguez	2016-11-03	16	-140/+247
\| \| \|
* \| \|	Clarify the author field for the changelog documentation	Robert Speicher	2016-11-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'group-name-validation' into 'master'	Alfredo Sumaran	2016-11-03	21	-174/+225
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds JavaScript validation for group path editing ## What does this MR do? - Prevents group_edit form submission when special characters are included in the new group name - Enhances gl_field_errors to support this use case and be more re-usable. ## Are there points in the code the reviewer needs to double check? The implementation of validation is here: https://gitlab.com/gitlab-org/gitlab-ce/commit/73d997046cac376ccdbcaac6f183002bc19b9a1f The rest of the diff for this MR is augmenting gl_field_errors ## Why was this MR needed? - Currently we allow submission and a 500 error is returned. ## Screenshots (if relevant) ![2016-10-21_14.11.21](/uploads/2bef5764d3f2429dd0f900661153eef7/2016-10-21_14.11.21.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [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/23564, https://gitlab.com/gitlab-org/gitlab-ce/issues/19756, https://gitlab.com/gitlab-org/gitlab-ce/issues/19736, https://gitlab.com/gitlab-org/gitlab-ce/issues/23922 See merge request !7041
\| * \|	Initialize form validation on new group form.group-name-validation	Bryce Johnson	2016-11-02	1	-1/+1
\| \| \|
\| * \|	Unchange username_validator.	Bryce Johnson	2016-11-02	1	-0/+1
\| \| \|
\| * \|	Move snake_case to camelCase.	Bryce Johnson	2016-11-02	1	-2/+2
\| \| \|
\| * \|	Change show-gl-field-errors to gl-show-field-errors	Bryce Johnson	2016-11-02	16	-19/+19
\| \| \|
\| * \|	Fix changelog.	Bryce Johnson	2016-11-01	1	-45/+1
\| \| \|
\| * \|	List gl_field_error as gl_field_errors dep.	Bryce Johnson	2016-11-01	1	-0/+3
\| \| \|
\| * \|	Break out GlFieldError into separate file.	Bryce Johnson	2016-11-01	2	-166/+165
\| \| \|
\| * \|	Add gl field errors to group name edit form.	Bryce Johnson	2016-11-01	3	-3/+50
\| \| \|
\| * \|	Upgrade gl_field_errors to support more use cases.	Bryce Johnson	2016-11-01	7	-39/+84
\| \| \|
* \| \|	Merge branch 'no-include-on-top-level' into 'master'	Rémy Coutable	2016-11-03	1	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't include Gitlab::Routing.url_helpers on top-level namespace (fix error for url_for) ## What does this MR do? Tries to fix: ``` ActionView::Template::Error: arguments passed to url_for can't be handled. Please require routes or provide your own implementation ``` One of the failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/5825797 See merge request !7265
\| * \| \|	Use stubs instead of modifying global statesno-include-on-top-level	Lin Jen-Shin	2016-11-03	1	-1/+3
\| \| \| \|
\| * \| \|	Try not to include anything globally!	Lin Jen-Shin	2016-11-03	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'zj-expose-system-hooks' into 'master'	Rémy Coutable	2016-11-03	4	-16/+44
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Expose more info for SystemHooks See merge request !6964
\| * \| \|	Update docs and test descriptionzj-expose-system-hooks	Z.J. van de Weg	2016-11-02	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Update docs and unexpose token	Zeger-Jan van de Weg	2016-11-02	4	-12/+22
\| \| \| \|
\| * \| \|	Be able to POST subscriptions for system hooks	Z.J. van de Weg	2016-10-31	2	-2/+20
\| \| \| \|
\| * \| \|	Expose more data on the SystemHooks API	Z.J. van de Weg	2016-10-31	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now exposed: - push_events - tag_push_events - enable_ssl_verification - token Fixes gitlab-org/gitlab-ce#23307
* \| \| \|	Merge branch 'update-install-guide-8-14' into 'master'	Rémy Coutable	2016-11-03	2	-2/+207
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update "Installation from source" guide for 8.14.0 Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1. See merge request !7271
\| * \| \| \|	Update "Installation from source" guide for 8.14.0	Alejandro Rodríguez	2016-11-03	2	-2/+207
\| \| \| \| \|
* \| \| \| \|	Add CHANGELOG entries for latest patches	Rémy Coutable	2016-11-03	1	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fix/import-export-symlink-vulnerability' into 'security'	Douwe Maan	2016-11-03	7	-4/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix symlink vulnerability in Import/Export Replaces https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2018 made by @james Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23822 See merge request !2022 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fix/import-projectmember-security' into 'security'	Douwe Maan	2016-11-03	4	-14/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Import/Export foreign key issue to do with project members Cleans-up any foreign keys in `ProjectMember` - same as we do with the rest of the models when importing. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23837 and https://gitlab.com/gitlab-org/gitlab-ce/issues/23739 See merge request !2020 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Add changelog instructions to CHANGELOG.md	Robert Speicher	2016-11-03	1	-1/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Update help banner for bin/changelog	Robert Speicher	2016-11-03	1	-1/+1
\| \|/ / \|/\| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'rs-changelog-force' into 'master'	Rémy Coutable	2016-11-03	3	-2/+38
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a `--force` option to bin/changelog See merge request !7252
\| * \| \|	Add a `--force` option to bin/changelogrs-changelog-force	Robert Speicher	2016-11-02	3	-2/+38
\| \| \| \|
* \| \| \|	Merge branch 'eslint-check-file-names' into 'master'	Fatih Acet	2016-11-02	3	-0/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check that JavaScript file names match convention ## What does this MR do? Introduce a new ESLint rule to check JavaScript file names. ## What are the relevant issue numbers? fixes #23118 See merge request !7238
\| * \| \|	Check that JavaScript file names match convention (!7238)	winniehell	2016-11-02	3	-0/+8
\| \| \| \|
* \| \| \|	Merge branch 'sortable-version-update' into 'master'	Fatih Acet	2016-11-02	3	-55/+149
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Sortable JS plugin ## What does this MR do? Updates Sortable JS plugin for issue boards. The older version stopped the issue cards being draggable. ## What are the relevant issue numbers? Closes #23048 See merge request !6734
\| * \| \| \|	Updated Sortable JS pluginsortable-version-update	Phil Hughes	2016-11-01	3	-55/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes an issue in Safari that stops issues from being draggable Closes #23048
* \| \| \| \|	Merge branch 'post_receive-spaces' into 'master'	Rémy Coutable	2016-11-02	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes spaces in log messages. refs: - 6f7ccea6686d4cc6c6241bc4289c13ff04cc8557 - 7121a58eb9e4dcb63d762e17a668f3bb4b0eaa85 - f54bf00309e310cabb2fec55d860f0670f3b79ac none of them seem to have added extra space deliberately (commit message is about something else) ## Why was this MR needed? The spaces caused confusion when trying to analyze the logs, there was no space in user name, but log message indicated there was. See merge request !7223
\| * \| \| \| \|	remove extra spaces from app/workers/post_receive.rb	Elan Ruusamäe	2016-11-01	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-changelog-docs' into 'master' vue-ize-field-errors	Robert Speicher	2016-11-02	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update examples in changelog docs to use single quotes around title [ci skip] See merge request !7246
\| * \| \| \| \| \|	Update examples in changelog docs to use single quotes around title	Robert Speicher	2016-11-02	1	-3/+3
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'boards-filter-zindex' into 'master'	Annabel Dunstone Gray	2016-11-02	1	-5/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed z-index for filters on issue boards ## What does this MR do? I dont know how this is has only just become a problem, but when the sidebar is open the filters on issue boards overlap it. ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-11-02_at_09.50.59](/uploads/430ec15249b866999e83fe402cd9bd35/Screen_Shot_2016-11-02_at_09.50.59.png) ### After ![Screen_Shot_2016-11-02_at_09.49.40](/uploads/3a417570a874197ce4b66cbfadbf8181/Screen_Shot_2016-11-02_at_09.49.40.png) See merge request !7235
\| * \| \| \| \| \|	Removed z-index for filters on issue boardsboards-filter-zindex	Phil Hughes	2016-11-02	1	-5/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'edit-button-wiki' into 'master'	Annabel Dunstone Gray	2016-11-02	4	-7/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix edit button in wiki ## What does this MR do? Fix edit button in wiki. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Show Wiki ![wiki_show](/uploads/7633b7de9921cb8abe688a11883b8d1d/wiki_show.png) ### Edit Wiki ![wiki_edit](/uploads/2529bb1d5eb5b33ef97da89e634bb8ad/wiki_edit.png) ## 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 - [ ] 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 #13444 See merge request !7143