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
\| *	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-05-04	5	-64/+125
\| \|\ \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-04	12	-32/+127
\| \|\ \
\| * \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-03	13	-148/+299
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-04-28	3	-1/+14
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-04-28	9	-37/+84
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Attempted adding separate clientside_sentry settings	Luke "Jared" Bennett	2017-04-28	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Support comments for personal snippets	Jarka Kadlecova	2017-05-05	4	-53/+45
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '30237-pipelines-actions-make-2-requests' into 'master'	Kamil Trzciński	2017-05-05	1	-2/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve: "Pipelines: When we retry a pipeline 2 requests are made to the pipelines endpoint" Closes #30237 See merge request !10584
\| * \| \| \| \| \| \|	Use wrap_parameters in pipelines controller	Grzegorz Bizon	2017-05-05	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it possible to workaround a bug in `safe_constantize` which caused a `LoadError` exception when doing ``` "Pipeline".safe_constantize LoadError: Unable to autoload constant Pipeline, expected /home/grzesiek/gdk/gitlab/app/models/ci/pipeline.rb to define it ``` See https://github.com/rails/rails/issues/28854 for more details.
\| * \| \| \| \| \| \|	Respond with no content for pipeline JSON actions	Grzegorz Bizon	2017-05-05	1	-6/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Retry and cancel endpoints send 204 json response. Request is made with type ↵	Filipa Lacerda	2017-05-05	1	-2/+18
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	json
* \| \| \| \| \| \|	Merge branch 'adam-separate-slash-commands' into 'master'	Rémy Coutable	2017-05-05	4	-28/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-28/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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".
* \| \| \| \| \| \| \|	Update design of auth error page	Annabel Dunstone Gray	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into 28433-internationalise-cycle-analytics-page	Ruben Davila	2017-05-04	16	-96/+252
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-4/+16
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy keys load async Closes #29667 See merge request !10973
\| \| * \ \ \ \ \ \	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-05-04	12	-84/+153
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / /
\| \| * \| \| \| \| \| \|	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-05-03	18	-152/+361
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Re-wrote to match our docs - still not 100% sure but closer than it was	Phil Hughes	2017-04-28	1	-2/+9
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-04-28	6	-9/+60
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/29667-deploy-keys' into ↵	Jacob Schatz	2017-04-27	1	-2/+7
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deploy-keys-load-async
\| \| \| * \| \| \| \| \| \| \| \|	Project deploy keys json end point	Jarka Kadlecova	2017-03-24	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-artifact-blob-viewer' into 'master'	Sean McGivern	2017-05-04	1	-5/+23
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-5/+23
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '12910-uploader-pers-snippet' into 'master'	Sean McGivern	2017-05-04	3	-55/+86
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare uploaders for personal snippets comments See merge request !11022
\| \| * \| \| \| \| \| \| \| \| \|	Support uploaders for personal snippets comments12910-uploader-pers-snippet	Jarka Kadlecova	2017-05-02	3	-55/+86
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'	Rémy Coutable	2017-05-04	3	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable navigation to Pages config if Pages is disabled Closes #30529 See merge request !11008
\| \| * \| \| \| \| \| \| \| \| \| \|	Disable navigation to Pages config if Pages is disabled	Mark Fletcher	2017-05-04	3	-0/+6
\| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Regards project-level pages config - Nav link is now shown only if Pages is enabled for instance - Navigation to following controllers denied if Pages disabled: * projects/pages_controller * projects/pages_domains_controller - 'disabled' partial removed + Test for pages_controller introduced
\| * \| \| \| \| \| \| \| \| \| \|	Allow to create new branch and empty WIP merge request from issue page	Alfredo Sumaran	2017-05-04	2	-15/+40
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dm-artifact-browser-header' into 'master'	Robert Speicher	2017-05-03	1	-2/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add breadcrumb, build header and pipelines submenu to artifacts browser See merge request !11050
\| \| * \| \| \| \| \| \| \| \| \|	Add breadcrumb, build header and pipelines submenu to artifacts browser	Douwe Maan	2017-05-03	1	-2/+6
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'	Sean McGivern	2017-05-03	1	-6/+9
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388
\| \| * \| \| \| \| \| \| \| \| \|	Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diff	Douwe Maan	2017-05-03	1	-6/+9
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	versions
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dm-blob-external-storage' into 'master'	Sean McGivern	2017-05-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2017-05-03	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28408-feature-proposal-include-search-options-to-pipelines-api' into 'master' Resolve "Feature Proposal: Include search options to pipelines API" Closes #28408 See merge request !9367
\| \| * \| \| \| \| \| \| \| \|	- Add new parameters for Pipeline API	Shinya Maeda	2017-05-03	1	-5/+5
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Expand PipelinesFinder functions
\| * \| \| \| \| \| \| \| \|	Merge branch 'async-milestone-tabs' into 'master'	Jacob Schatz	2017-05-03	3	-3/+60
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load milestone tabs asynchronously See merge request !10919
\| \| * \| \| \| \| \| \| \|	Fixed failing specs	Phil Hughes	2017-04-26	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Added controller specs	Phil Hughes	2017-04-26	1	-0/+11
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fixed feature spec not waiting for ajax request to finish	Phil Hughes	2017-04-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed 404 in project milestones when not logged in
\| \| * \| \| \| \| \| \| \|	Load milestone tabs asynchronously	Phil Hughes	2017-04-26	3	-2/+48
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	More updates for translations plus some refactoring.	Ruben Davila	2017-05-03	1	-9/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	First round of updates from the code review.	Ruben Davila	2017-05-02	3	-6/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' into 28433-internationalise-cycle-analytics-page	Ruben Davila	2017-05-02	27	-236/+442
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'metrics-deployment-history' into 'master'	Douwe Maan	2017-05-02	1	-0/+18
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Metrics deployment history Closes #26914 See merge request !10649
\| \| * \| \| \| \| \| \| \|	use represent_concise instead of separate entity	Pawel Chojnacki	2017-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	DeploymentsSerializer can serialize arrays properly	Pawel Chojnacki	2017-04-24	1	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2017-04-20	63	-511/+763
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	26914-add_deploy_history_data_source