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/+1
\|\ \| \| \| \| \| \| \| \|	Add sentry JS See merge request !6764
\| *	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-05-04	3	-0/+14
\| \|\ \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \|	Review changes, removed api/v3 updates as its frozen, removed the ↵	Luke "Jared" Bennett	2017-05-04	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \|	clientside_sentry properties from the sensitive data filter as they\'re both available publically
\| * \|	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-04	2	-1/+11
\| \|\ \
\| * \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-03	7	-15/+28
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-04-28	2	-0/+4
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-04-28	2	-1/+2
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fixed specs	Luke "Jared" Bennett	2017-04-28	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Attempted adding separate clientside_sentry settings	Luke "Jared" Bennett	2017-04-28	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-04-26	10	-119/+124
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # config/webpack.config.js
\| * \| \| \| \| \| \|	Removed rewire and fixed tests	Luke "Jared" Bennett	2017-04-15	1	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only rewire in dev	Luke "Jared" Bennett	2017-04-15	1	-2/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-04-15	9	-23/+138
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js
\| * \| \| \| \| \| \| \|	Updated specs, added rewire, updated layouts to move conditional raven and ↵	Luke "Jared" Bennett	2017-04-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gon to head
\| * \| \| \| \| \| \| \|	[ci skip] Remove loadscript class in favour of backend conditional	Luke "Jared" Bennett	2017-04-13	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mrchrisw-import-shell-timeout'	Sean McGivern	2017-05-05	2	-0/+4
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout	Chris Wilson	2017-04-27	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 28433-internationalise-cycle-analytics-page	Ruben Davila	2017-05-04	4	-1/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
\| * \| \| \| \| \| \| \| \|	Merge branch 'deploy-keys-load-async' into 'master'	Filipa Lacerda	2017-05-04	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy keys load async Closes #29667 See merge request !10973
\| \| * \| \| \| \| \| \| \| \|	Updated webpack config	Phil Hughes	2017-05-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-05-04	2	-0/+12
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-05-03	8	-16/+38
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Re-wrote to match our docs - still not 100% sure but closer than it was	Phil Hughes	2017-04-28	1	-0/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-artifact-blob-viewer' into 'master'	Sean McGivern	2017-05-04	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+1
\| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '12910-uploader-pers-snippet' into 'master'	Sean McGivern	2017-05-04	1	-0/+11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow to create new branch and empty WIP merge request from issue page	Alfredo Sumaran	2017-05-04	1	-0/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'async-milestone-tabs' into 'master'	Jacob Schatz	2017-05-03	2	-1/+10
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load milestone tabs asynchronously See merge request !10919
\| \| * \| \| \| \| \| \| \|	Load milestone tabs asynchronously	Phil Hughes	2017-04-26	2	-1/+10
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add CHANGELOG entry, some specs and locale file for German.	Ruben Davila	2017-05-04	1	-0/+219
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	More updates for translations plus small tweaks.	Ruben Davila	2017-05-04	1	-0/+217
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Disable FastGettext from translating AR attrs.	Ruben Davila	2017-05-04	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It isn't working fine when using POROs in forms like WikiPage, the following error is being raised: undefined method `abstract_class?' for Object:Class
* \| \| \| \| \| \| \| \|	First round of updates from the code review.	Ruben Davila	2017-05-02	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' into 28433-internationalise-cycle-analytics-page	Ruben Davila	2017-05-02	14	-18/+51
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'remove-unused-initializer' into 'master'	Douwe Maan	2017-05-02	1	-5/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused initializer See merge request !11036
\| \| * \| \| \| \| \| \| \|	Remove unused initializerremove-unused-initializer	Sean McGivern	2017-05-02	1	-5/+0
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't appear to have an `active_record_query_trace` dependency any more.
\| * \| \| \| \| \| \| \|	Merge branch 'metrics-deployment-history' into 'master'	Douwe Maan	2017-05-02	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Metrics deployment history Closes #26914 See merge request !10649
\| \| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2017-04-20	15	-149/+286
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	26914-add_deploy_history_data_source
\| \| * \| \| \| \| \| \| \| \|	Add endpoint that returns a list of deployments that happened within last ↵	Pawel Chojnacki	2017-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8.hours add index created_at
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dm-snippet-download-button' into 'master'	Sean McGivern	2017-05-02	2	-3/+2
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add download button to project snippets See merge request !11004
\| \| * \| \| \| \| \| \| \| \| \|	Add download button to project snippetsdm-snippet-download-button	Douwe Maan	2017-04-30	2	-3/+2
\| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '12910-personal-snippets-notes-show' into 'master'	Sean McGivern	2017-05-02	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display comments for personal snippets See merge request !10974
\| \| * \| \| \| \| \| \| \| \| \|	Display comments for personal snippets12910-personal-snippets-notes-show	Jarka Kadlecova	2017-05-02	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '19364-webhook-edit' into 'master'	Dmitriy Zaporozhets	2017-05-02	2	-3/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement ability to update hooks Closes #19364 See merge request !10816
\| \| * \| \| \| \| \| \| \| \| \| \|	Implement ability to update hooks	Alexander Randa	2017-04-28	2	-3/+5
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'pdflab-in-repo' into 'master'	Phil Hughes	2017-05-02	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move PDFLab assets into repo See merge request !10642
\| \| * \| \| \| \| \| \| \| \| \|	Move PDFLab into GitLabpdflab-in-repo	Sam Rose	2017-04-28	1	-0/+5
\| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Carrierwave and fog-core	Zeger-Jan van de Weg	2017-05-01	1	-0/+2
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve "rspec_profiling is enabled for MySQL"	Rémy Coutable	2017-04-28	1	-4/+4
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|