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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Unify dropdown button stylesfile-toggle	Annabel Dunstone Gray	2016-11-03	6	-14/+16
\|
*	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
\| * \| \| \| \| \|	Add a CHANGELOG entry	Hiroyuki Sato	2016-11-01	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix edit button wiki	Hiroyuki Sato	2016-11-01	3	-7/+7
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-bin-changelog' into 'master'	Rémy Coutable	2016-11-02	5	-7/+396
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a bin/changelog script and changelog documentation See merge request !7098
\| * \| \| \| \| \|	Add specs for ChangelogOptionParser in bin/changelogrs-bin-changelog	Robert Speicher	2016-10-31	2	-1/+67
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog documentation	Robert Speicher	2016-10-31	3	-7/+167
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a bin/changelog script	Robert Speicher	2016-10-31	1	-0/+163
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'eslint-ignore-coverage-files' into 'master'	Rémy Coutable	2016-11-02	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make ESLint ignore instrumented files for coverage analysis ## What does this MR do? Ignore files in `coverage-javascript/` directory. ## Why was this MR needed? When running ESLint after coverage analysis locally, it led to many linting errors. CI was not affected (ESLint and coverage are different jobs). See merge request !7236
\| * \| \| \| \| \| \|	Make ESLint ignore instrumented files for coverage analysis (!7236)	winniehell	2016-11-02	1	-0/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-diffy' into 'master'	Rémy Coutable	2016-11-02	2	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update diffy gem to 3.1.0 See merge request !7184
\| * \| \| \| \| \| \|	Update diffy gem to 3.1.0	Manuel Rüger	2016-10-31	2	-3/+3
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ChangeLog: https://github.com/samg/diffy/blob/master/CHANGELOG
* \| \| \| \| \| \|	Merge branch 'bkintz/gitlab-ce-17846-jira-comment-path'	Rémy Coutable	2016-11-02	3	-1/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the server's base URL without relative URL part when creating links in JIRA Closes #17846 See merge request !6143
\| * \| \| \| \| \| \|	Use the server's base URL without relative URL part when creating links in JIRA	Brian Kintz	2016-11-02	3	-1/+24
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'fix/contributing-mr-template' into 'master'	Rémy Coutable	2016-11-02	1	-3/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace links to the `Merge request description format` section with up-to-date instructions on using the MR template built into the UI. The `Merge request description format` section was removed in 2f7e28d1, but links were left in the table of contents and in the MR description instructions. Presumably, the section was removed because MR templates are now provided by the GitLab UI. See merge request !7228
\| * \| \| \| \| \| \|	Replace MR Description Format links	Daniel Axelrod	2016-11-02	1	-3/+5
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace links to the `Merge request description format` section with up-to-date instructions on using the MR template built into the UI. The `Merge request description format` section was removed in 2f7e28d1, but links were left in the table of contents and in the MR description instructions.
* \| \| \| \| \| \|	Merge branch 'patch-8' into 'master'	Rémy Coutable	2016-11-02	1	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explains the problem instead of Yelling. The relevant part that fails is in gitlab-shell: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.6/hooks/post-receive#L8 See merge request !7224
\| * \| \| \| \| \| \|	Update gitlab.yml.example	Elan Ruusamäe	2016-11-02	1	-1/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'update-rack-attack' into 'master'	Rémy Coutable	2016-11-02	2	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates rack-attack gem to 4.4.1 See merge request !7186
\| * \| \| \| \| \| \|	Update rack-attack gem to 4.4.1	Manuel Rüger	2016-10-31	2	-3/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See: https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md
* \| \| \| \| \| \|	Merge branch 'mrchrisw/gitlab-version-fix' into 'master'	Achilleas Pipinellis	2016-11-02	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab 8.13 not 13 cc// @felipe_artur See merge request !7234
\| * \| \| \| \| \| \|	GitLab 8.13 not 13mrchrisw/gitlab-version-fix	Chris Wilson	2016-11-02	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/backtrace-command' into 'master'	Sean McGivern	2016-11-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gdb backtrace command See merge request !7227