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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'add-sentry-js-again-with-vue' into 'master'	Phil Hughes	2017-05-05	1	-0/+2
\|\ \| \| \| \| \| \| \| \|	Add sentry JS See merge request !6764
\| *	Review changesadd-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-05	1	-1/+0
\| \|
\| *	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-05-04	3	-8/+17
\| \|\ \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-04	5	-30/+39
\| \|\ \
\| * \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-03	17	-73/+522
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-04-28	7	-51/+72
\| \|\ \ \ \
\| * \| \| \| \|	Fixed specs	Luke "Jared" Bennett	2017-04-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unneeded helper include	Luke "Jared" Bennett	2017-04-28	1	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed view to correct property	Luke "Jared" Bennett	2017-04-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Attempted adding separate clientside_sentry settings	Luke "Jared" Bennett	2017-04-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-04-26	22	-104/+265
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # config/webpack.config.js
\| * \ \ \ \ \	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-04-15	51	-197/+1511
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js
\| * \| \| \| \| \| \|	[ci skip] Remove loadscript class in favour of backend conditional	Luke "Jared" Bennett	2017-04-13	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-04-04	214	-1369/+3129
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Added raven and raven-vue plugin, updated gon_helper with data needed for ↵	Luke Bennett	2017-01-23	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	raven and created raven_config, required by application.js Added is_production to define sentry environment Removed as much jQuery as possible Added public_sentry_dsn application_settings helper method Use URI module instead of regex for public dsn Removed raven-vue and load raven on if sentry is enabled Add load_script spec added raven_config spec added class_spec_helper and tests added sentry_helper spec added feature spec
* \| \| \| \| \| \| \| \|	Merge branch 'prometheus-integration-test-setting-fix' into 'master'	Robert Speicher	2017-05-05	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added rescue block for the test method for the prometheus service Closes #31451 See merge request !10994
\| * \| \| \| \| \| \| \| \|	Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fix	Jose Ivan Vargas	2017-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improved code styling and added a HTTParty rescue block	Jose Ivan Vargas	2017-05-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added specs	Jose Ivan Vargas	2017-05-04	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added rescue block for the test method for the prometheus service	Jose Ivan Vargas	2017-05-04	1	-1/+5
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mrchrisw-import-shell-timeout'	Sean McGivern	2017-05-05	1	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout	Chris Wilson	2017-04-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings.
* \| \| \| \| \| \| \| \| \|	Fix email receiver metrics eventsfix-email-receiver-metrics	Sean McGivern	2017-05-05	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Project#inspect` isn't very useful for examining usage of these features.
* \| \| \| \| \| \| \| \| \|	Merge branch 'adam-separate-slash-commands' into 'master'	Rémy Coutable	2017-05-05	2	-15/+83
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display slash commands outcome when previewing Markdown Closes #21531 See merge request !10054
\| * \| \| \| \| \| \| \| \| \|	Display slash commands outcome when previewing Markdownadam-separate-slash-commands	Rares Sfirlogea	2017-05-04	2	-15/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove slash commands from Markdown preview and display their outcome next to the text field. Introduce new "explanation" block to our slash commands DSL. Introduce optional "parse_params" block to slash commands DSL that allows to process a parameter before it is passed to "explanation" or "command" blocks. Pass path for previewing Markdown as "data" attribute instead of setting a variable on "window".
* \| \| \| \| \| \| \| \| \| \|	Some small updates for Spanish translations.	Ruben Davila	2017-05-04	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 28433-internationalise-cycle-analytics-page	Ruben Davila	2017-05-04	14	-84/+123
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
\| * \| \| \| \| \| \| \| \| \| \|	Fix wording of Cycle Analytics stage legends	Douwe Maan	2017-05-04	3	-3/+3
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dm-artifact-blob-viewer' into 'master'	Sean McGivern	2017-05-04	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use blob viewer for job artifacts Closes #31297 See merge request !11018
\| \| * \| \| \| \| \| \| \| \| \|	Add artifact file page that uses the blob viewerdm-artifact-blob-viewer	Douwe Maan	2017-05-04	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'	Douwe Maan	2017-05-04	1	-7/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort the network graph both by commit date and topographically Closes #30973 See merge request !11057
\| \| * \| \| \| \| \| \| \| \| \|	Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topo	Timothy Andrew	2017-05-04	1	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Previously, we sorted commits by date, which seemed to work okay. - The one edge case where this failed was when multiple commits have the same commit date (for example: when a range of commits are cherry picked with a single command, they all have the same commit date [and different author dates]). - Commits with the same commit date would be sorted arbitrarily, and usually break the network graph. - This commit solves the problem by both sorting by date, and by sorting topographically (parents aren't displayed until all their children are displayed) - Include review comments from @adamniedzielski A more detailed explanation is present here: https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '12910-uploader-pers-snippet' into 'master'	Sean McGivern	2017-05-04	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare uploaders for personal snippets comments See merge request !11022
\| \| * \| \| \| \| \| \| \| \| \|	Support uploaders for personal snippets comments12910-uploader-pers-snippet	Jarka Kadlecova	2017-05-02	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵	Sean McGivern	2017-05-04	1	-5/+11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Handle incoming emails from aliases correctly See merge request !11079
\| \| * \| \| \| \| \| \| \| \|	Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-come	Sean McGivern	2017-05-03	1	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These set the 'actual' destination email in one of the Delivered-To lines, so check those too.
\| * \| \| \| \| \| \| \| \| \|	Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵	Douwe Maan	2017-05-03	1	-21/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' removes the possibility of commit messages having carriage returns Closes #31671 See merge request !11077
\| \| * \| \| \| \| \| \| \| \| \|	removes the possibility of commit messages having carriage returns	Tiago Botelho	2017-05-03	1	-21/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-blob-external-storage' into 'master'	Sean McGivern	2017-05-03	1	-2/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048
\| \| * \| \| \| \| \| \| \| \| \| \|	Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storage	Douwe Maan	2017-05-03	1	-2/+10
\| \| \| \|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix project tree saver and fork spec failures	James Lopez	2017-05-03	1	-0/+1
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix lazy error handling of cron parser	Dosuken shinya	2017-05-03	1	-2/+17
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'emoji-button-titles' into 'master'	Filipa Lacerda	2017-05-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added emoji description title to award emoji buttons Closes #29971 See merge request !10881
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into emoji-button-titles	Phil Hughes	2017-04-27	3	-31/+22
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into emoji-button-titles	Phil Hughes	2017-04-27	13	-59/+136
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Moved the title onto the emoji tag	Phil Hughes	2017-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the description in all places emojis are used
\| * \| \| \| \| \| \| \| \| \| \| \|	Include missing project attributes to Import/Export	James Lopez	2017-05-03	3	-8/+31
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-gitaly-not-found' into 'master'	Douwe Maan	2017-05-02	2	-34/+32
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable ref operations with gitaly after not-found fix See merge request !10773
\| \| * \| \| \| \| \| \| \| \| \| \|	Re-enable ref operations with gitaly after not-found fixfix-gitaly-not-found	Alejandro Rodríguez	2017-05-02	2	-34/+32
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry, some specs and locale file for German.	Ruben Davila	2017-05-04	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|