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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploader	Kamil Trzcinski	2017-06-13	2	-2/+39
\|
*	Merge branch 'rc/load-images-in-phantomjs' into 'master'	Robert Speicher	2017-06-12	3	-12/+9
\|\ \| \| \| \| \| \| \| \|	Let PhantomJS load local images See merge request !12003
\| *	Let PhantomJS load local imagesrc/load-images-in-phantomjs	Rémy Coutable	2017-06-12	3	-12/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-19/+50
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-19/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+82
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
\| * \| \|	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 linting, route, and specs	Rémy Coutable	2017-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '32834-task-note-only' into 'master'	Sean McGivern	2017-06-12	3	-6/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent Description Change Notes When Toggling Tasks Closes #32834 See merge request !12057
\| * \| \| \|	Only add a description change note when no tasks are updated	Jared Deckard	2017-06-12	2	-5/+35
\| \| \| \| \|
\| * \| \| \|	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	2	-0/+61
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the ability to perform background migrations See merge request !11854
\| * \| \| \| \|	Add the ability to perform background migrations	Yorick Peterse	2017-06-12	2	-0/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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 'operau2f' into 'master'	Rémy Coutable	2017-06-12	1	-0/+49
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix FIDO U2F for Opera browser (based on !10118) See merge request !12082
\| * \| \| \| \| \|	Add test for u2f helper and changelog entry	Jonas Kalderstam	2017-06-11	1	-0/+49
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '33003-avatar-in-project-api' into 'master'	Rémy Coutable	2017-06-12	1	-0/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept avatar file in project API Closes #33003 See merge request !11988
\| * \| \| \| \| \|	Accept image for avatar in project API	vanadium23	2017-06-09	1	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Improve Job detail view to make it refreshed in real-time instead of reloading	Filipa Lacerda	2017-06-12	12	-147/+518
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-simplify-todo-count-spec' into 'master'	Rémy Coutable	2017-06-12	2	-23/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test todos_count_format helper at the correct level to improve speed See merge request !12075
\| * \| \| \| \| \| \|	Test todos_count_format helper at the correct level to improve speedrs-simplify-todo-count-spec	Robert Speicher	2017-06-09	2	-23/+13
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of an integration test that creates 101 Todo records to test a simple view helper, just unit test the helper.
* \| \| \| \| \| \|	Merge branch 'sh-recaptcha-fix-try2' into 'master'	Sean McGivern	2017-06-12	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080
\| * \| \| \| \| \|	Make sure reCAPTCHA configuration is loaded when spam checks are initiatedsh-recaptcha-fix-try2	Stan Hu	2017-06-10	1	-0/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously it was possible when an issue was updated and Akismet flagged it as spam that the reCAPTCHA configuration was not loaded. Closes #33532
* \| \| \| \| \|	Use vue files for navigation tabs and buttons	Filipa Lacerda	2017-06-12	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'dm-revert-mr-8427'	Douwe Maan	2017-06-09	9	-399/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Revert 'New file from interface on existing branch'dm-revert-mr-8427	Douwe Maan	2017-06-09	9	-399/+4
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch '32622-fix-markdown_preview_spec' into 'master'	Robert Speicher	2017-06-09	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure wiki is created before we visit the Wiki page Closes #32622 See merge request !12059
\| * \| \| \|	Ensure wiki is created before we visit the Wiki page32622-fix-markdown_preview_spec	Rémy Coutable	2017-06-09	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	:facepalm: Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'tc-link-to-commit-on-help-page' into 'master'	Robert Speicher	2017-06-09	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the revision on the `/help` page clickable See merge request !12016
\| * \| \| \|	Make the revision on the `/help` page clickabletc-link-to-commit-on-help-page	Toon Claes	2017-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For quicker access, add hyperlink to the gitlab.com commits page for the current REVISION of GitLab.
* \| \| \| \|	Merge branch 'pat-msg-on-auth-failure' into 'master'	Rémy Coutable	2017-06-09	3	-7/+63
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prompt user to create personal access token for Git over HTTP See merge request !11986
\| * \| \| \| \|	Instruct user to use a personal access token for Git over HTTP	Robin Bobbitt	2017-06-07	3	-7/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
* \| \| \| \| \|	Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'	Sean McGivern	2017-06-09	3	-5/+87
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dashboard milestone tabs not loading Closes #33477 See merge request !12023
\| * \| \| \| \| \|	Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-async	Phil Hughes	2017-06-09	3	-5/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33477
* \| \| \| \| \| \|	Merge branch '33381-display-issue-state-in-mr-widget-issue-links' into 'master'	Sean McGivern	2017-06-09	1	-0/+10
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display issue state in issue links section of merge request widget Closes #33381 See merge request !12021
\| * \| \| \| \| \|	Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-links	Adam Niedzielski	2017-06-09	1	-0/+10
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-blob-binaryness-change' into 'master'	Sean McGivern	2017-06-09	2	-5/+36
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect if blob binaryness changes after loading all data See merge request !11981
\| * \| \| \| \|	Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-change	Douwe Maan	2017-06-08	2	-5/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	binary afer loading all data
* \| \| \| \| \|	Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master'	Filipa Lacerda	2017-06-09	1	-1/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dropdown filter input not focusing after transition Closes #33216 See merge request !12020
\| * \| \| \| \|	Fixed dropdown filter input not focusing after transitionissuable-sidebar-edit-button-field-focus	Phil Hughes	2017-06-08	1	-1/+3
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33216
* \| \| \| \|	Merge branch 'port-post-receive-changes' into 'master'	Robert Speicher	2017-06-08	1	-16/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor PostReceive worker to limit merge conflicts See merge request !11916
\| * \| \| \| \|	Refactor PostReceive worker to limit merge conflictsport-post-receive-changes	Douglas Barbosa Alexandre	2017-06-05	1	-16/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master'	Douwe Maan	2017-06-08	1	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use RequestStore on MR show.json query count spec See merge request !12024
\| * \| \| \| \| \|	Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-spec	Oswaldo Ferreira	2017-06-08	1	-1/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master-security-update' into 'master'	Regis Boudinot	2017-06-08	28	-41/+748
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Master security update See merge request !12025
\| * \ \ \ \ \ \	Merge remote-tracking branch 'origin/upstream-9-2-security' into ↵master-security-update	DJ Mountney	2017-06-08	1	-5/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-security-update