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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix wrong link to codeclimate diff docsdocs/codeclimate-fix-link	Achilleas Pipinellis	2017-06-14	1	-1/+1
\|
*	Merge branch 'fix_docs_commits_multiple_files' into 'master'	Rémy Coutable	2017-06-13	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions See merge request !12117
\| *	Documentation bugfix of invalid JSON payload example of Create a commit with ↵	blackst0ne	2017-06-13	2	-1/+6
\| \| \| \| \| \| \| \|	multiple files and actions
* \|	Merge branch 'fix-filename-of-artifact-uploader' into 'master'	Grzegorz Bizon	2017-06-13	3	-2/+43
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Fix filename method of GitlabUploader to return always real filename Closes #33524 See merge request !12113
\| *	Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploader	Kamil Trzcinski	2017-06-13	3	-2/+43
\| \|
* \|	Merge branch 'winh-ignore-CVE-2017-5029' into 'master'	Robert Speicher	2017-06-12	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Ignore CVE-2017-5029 in Nokogiri Closes #33597 See merge request !12109
\| *	Ignore CVE-2017-5029 in Nokogiri	winh	2017-06-12	1	-1/+1
\| \|
* \|	Merge branch 'rc/load-images-in-phantomjs' into 'master'	Robert Speicher	2017-06-12	4	-13/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Let PhantomJS load local images See merge request !12003
\| * \|	Let PhantomJS load local imagesrc/load-images-in-phantomjs	Rémy Coutable	2017-06-12	4	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change fix a memory leak due to a Webkit bug: https://github.com/ariya/phantomjs/issues/12903 Also: - Whitelist only localhost and 127.0.0.1 in Capybara + JS specs - Blacklist all requests to media such as images, videos, PDFs, CSVs etc. - Log all the requests made. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'	Kamil Trzciński	2017-06-12	7	-31/+77
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set artifact working directory to be in the destination store to prevent unnecessary I/O Closes #33274 See merge request !11905
\| * \| \|	Set artifact working directory to be in the destination store to prevent ↵sh-fix-refactor-uploader-work-dir	Stan Hu	2017-06-06	7	-31/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unnecessary I/O Similar to #33218, build artifacts were being uploaded into a CarrierWave temporary directory in the Rails root directory before moved to their final destination, which could cause a copy across filesystems. This merge request refactors the work in !11866 so that any uploader can just override `work_dir` to change the default implementation. Closes #33274
* \| \| \|	Merge branch '29010-perf-bar' into 'master'	Robert Speicher	2017-06-12	27	-2/+771
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
\| * \| \| \|	DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-bar	Rémy Coutable	2017-06-09	4	-47/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix peek-rblineprof JS	Rémy Coutable	2017-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Ensure peek-performance_bar doesn't break existing functionalities	Rémy Coutable	2017-06-09	3	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Add a feature spec for the performance bar	Rémy Coutable	2017-06-09	1	-0/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix vendor/peek.js so that it can be bundled with Webpack	Rémy Coutable	2017-06-09	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix linting, route, and specs	Rémy Coutable	2017-06-09	7	-18/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Improve the JS for the `p b` shortcut and fix its CSS	Rémy Coutable	2017-06-09	2	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix spec failures and add a feature flag for the performance bar	Rémy Coutable	2017-06-09	3	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Add `p b` to the shortcuts documentation	Rémy Coutable	2017-06-09	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix Rubocop offenses, improve SQL duration format and changelog entry	Rémy Coutable	2017-06-09	8	-63/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Add CHANGELOG entry	Rémy Coutable	2017-06-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Small adjustments	Rémy Coutable	2017-06-09	4	-259/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Display queries duration in performance bar queries modal	Rémy Coutable	2017-06-09	4	-80/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Improve UI of the performance bar	Rémy Coutable	2017-06-09	3	-10/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix replacement of Pygments with Rouge	Rémy Coutable	2017-06-09	4	-9/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Replace Tipsy by Bootstrap's tooltips	Rémy Coutable	2017-06-09	4	-55/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres group	Rémy Coutable	2017-06-09	5	-6/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Tweak Peek to display SQL queries	Rémy Coutable	2017-06-09	4	-30/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Store Sherlock::Query in Peek adapter	Rémy Coutable	2017-06-09	3	-0/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	New performance bar that can be enabled with the `p b` shortcut	Rémy Coutable	2017-06-09	18	-1/+791
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch '32834-task-note-only' into 'master'	Sean McGivern	2017-06-12	5	-11/+47
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent Description Change Notes When Toggling Tasks Closes #32834 See merge request !12057
\| * \| \| \|	Add a changelog entry	Jared Deckard	2017-06-12	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Only add a description change note when no tasks are updated	Jared Deckard	2017-06-12	3	-10/+42
\| \| \| \| \|
\| * \| \| \|	Fix incorrect spec description	Jared Deckard	2017-06-09	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffs	Rémy Coutable	2017-06-12	8	-0/+322
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the ability to perform background migrations See merge request !11854
\| * \| \| \| \|	Add the ability to perform background migrations	Yorick Peterse	2017-06-12	8	-0/+322
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Background migrations can be used to perform long running data migrations without these blocking a deployment procedure. See MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11854 for more information.
* \| \| \| \| \|	Merge branch 'retry-specs' into 'master'	Robert Speicher	2017-06-12	1	-3/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempts to run RSpec tests twice (1 retry) See merge request !12066
\| * \| \| \| \| \|	Attempts to run RSpec tests twice (1 retry)retry-specs	Rémy Coutable	2017-06-12	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'fix/import-commit-status-issue' into 'master'	Douwe Maan	2017-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore commit status name validation on importing Closes #33490 See merge request !12039
\| * \| \| \| \| \| \|	ignore name validation on importingfix/import-commit-status-issue	James Lopez	2017-06-12	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'use-request-store-helper-instead-actual-code' into 'master'	Douwe Maan	2017-06-12	10	-82/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use :request_store hooks on specs See merge request !12058
\| * \| \| \| \| \| \|	Use :request_store hooks on specsuse-request-store-helper-instead-actual-code	Oswaldo Ferreira	2017-06-09	10	-82/+20
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitlab-workhorse-2.1.1' into 'master'	Douwe Maan	2017-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-workhorse to v2.1.1 See merge request !12049
\| * \| \| \| \| \| \| \|	Update gitlab-workhorse to v2.1.1	Nick Thomas	2017-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-zh_TW-00' into 'master'	Douwe Maan	2017-06-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a few translation for zh_TW See merge request !12043
\| * \| \| \| \| \| \| \| \|	Fix a few translation for zh_TWfix-zh_TW-00	Lin Jen-Shin	2017-06-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'	Robert Speicher	2017-06-12	1	-7/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate patch with git diff instead of git format-patch Closes #33525 See merge request !12060
\| * \| \| \| \| \| \| \| \| \|	Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patch	Rémy Coutable	2017-06-09	1	-7/+3
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will generate a patch: - that is smaller - that applies more cleanly since only the final diff will be applied instead of each commit's diff Signed-off-by: Rémy Coutable <remy@rymai.me>