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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add sidebar specsadd-sidebar-specs	Clement Ho	2017-05-05	13	-13/+732
\|
*	Address static analyzer warningmia_backort	Valery Sizov	2017-05-05	1	-1/+1
\|
*	Remove wrong changelog	Valery Sizov	2017-05-05	1	-4/+0
\|
*	Multiple issue assignee: fix for CE restrictions	Valery Sizov	2017-05-05	2	-3/+3
\|
*	Revert participants style change	Clement Ho	2017-05-05	1	-4/+6
\|
*	Multiple issue assignee: CE restriction for multiple assignees	Valery Sizov	2017-05-05	3	-0/+52
\|
*	Multiple issue assignee: resolve conflicts after merging upstream	Valery Sizov	2017-05-05	2	-20/+14
\|
*	[skip ci] Fix FE conflicts with master	Clement Ho	2017-05-05	7	-36/+5
\|
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵	Valery Sizov	2017-05-05	290	-1506/+7307
\|\ \| \| \| \| \| \|	skip]
\| *	Merge branch 'prometheus-integration-test-setting-fix' into 'master'	Robert Speicher	2017-05-05	5	-1/+45
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+3
\| \| \|
\| \| *	Improved code styling and added a HTTParty rescue block	Jose Ivan Vargas	2017-05-04	4	-22/+29
\| \| \|
\| \| *	Added specs	Jose Ivan Vargas	2017-05-04	3	-5/+33
\| \| \|
\| \| *	Added rescue block for the test method for the prometheus service	Jose Ivan Vargas	2017-05-04	3	-3/+12
\| \| \|
\| * \|	Merge branch 'mrchrisw-import-shell-timeout'	Sean McGivern	2017-05-05	5	-2/+51
\| \|\ \
\| \| * \|	Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout	Chris Wilson	2017-04-27	5	-2/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '31747-fix-transient-failures-when-tests-run-too-fast' into ↵	Sean McGivern	2017-05-05	2	-9/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Expect latency to be non-negative number. Closes #31747 See merge request !11116
\| \| * \| \|	Set minimum latency to be non-negative number.	Pawel Chojnacki	2017-05-05	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes the tests run so fast latency is calculated as 0. This causes transient failures in our CI.
\| * \| \| \|	Merge branch 'fix-email-receiver-metrics' into 'master'	Rémy Coutable	2017-05-05	3	-3/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix email receiver metrics events See merge request !11112
\| \| * \| \| \|	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 'issue-boards-no-avatar' into 'master'	Filipa Lacerda	2017-05-05	8	-12/+38
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed avatar not displaying in issue boards Closes #31428 See merge request !10977
\| \| * \| \| \|	Changed how the default avatar is setissue-boards-no-avatar	Phil Hughes	2017-05-04	7	-14/+33
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into issue-boards-no-avatar	Phil Hughes	2017-05-04	667	-3440/+13617
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Fixed avatar not displaying in issue boards	Phil Hughes	2017-04-28	4	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This happens when Gravatar is disabled in the admin settings, the avatar is returned as null & then frontend didn't do anything about it. Closes #31428
\| * \| \| \| \| \|	Merge branch '27614-instant-comments' into 'master'	Filipa Lacerda	2017-05-05	16	-65/+607
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add instant comments support Closes #27614 See merge request !10760
\| \| * \| \| \| \| \|	Add instant comments support	Kushal Pandya	2017-05-05	16	-65/+607
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch '30237-pipelines-actions-make-2-requests' into 'master'	Kamil Trzciński	2017-05-05	3	-3/+53
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve: "Pipelines: When we retry a pipeline 2 requests are made to the pipelines endpoint" Closes #30237 See merge request !10584
\| \| * \| \| \| \|	Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requests	Grzegorz Bizon	2017-05-05	1	-0/+36
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	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	2	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	json
\| * \| \| \| \| \|	Merge branch 'merge-request-poll-json-endpoint' into 'master'	Filipa Lacerda	2017-05-05	2	-1/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed bug where merge request JSON would show Closes #28909 See merge request !11096
\| \| * \| \| \| \| \|	Fixed bug where merge request JSON would showmerge-request-poll-json-endpoint	Phil Hughes	2017-05-04	2	-1/+5
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #28909
\| * \| \| \| \| \|	Merge branch 'adam-separate-slash-commands' into 'master'	Rémy Coutable	2017-05-05	28	-133/+785
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	28	-133/+785
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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".
\| * \| \| \| \| \| \|	Merge branch '31552-documentation-dos-and-donts' into 'master'	Phil Hughes	2017-05-05	2	-283/+334
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Documentation: Frontend list of do's and don'ts" Closes #31552 See merge request !11091
\| \| * \| \| \| \| \| \|	Changes after review31552-documentation-dos-and-donts	Filipa Lacerda	2017-05-04	1	-19/+13
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add missing points	Filipa Lacerda	2017-05-04	1	-8/+70
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Adds numbered lists to easily point to documentation	Filipa Lacerda	2017-05-04	2	-282/+277
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'manual-build-trigger' into 'master'	Marin Jankovski	2017-05-05	3	-0/+59
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a manual job to trigger package build in omnibus Closes omnibus-gitlab#2234 See merge request !11086
\| \| * \| \| \| \| \| \| \|	Add a manual job to trigger package build in omnibus	Balasankar C	2017-05-05	3	-0/+59
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '29145-oauth-422' into 'master'	Phil Hughes	2017-05-05	5	-12/+143
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update design of auth error page Closes #29145 See merge request !11099
\| \| * \| \| \| \| \| \| \|	Update design of auth error page	Annabel Dunstone Gray	2017-05-05	5	-12/+143
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '31810-commit-link' into 'master'	Phil Hughes	2017-05-05	2	-1/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove # char for commit Closes #31810 See merge request !11093
\| \| * \| \| \| \| \| \| \|	Remove # char for commit	Filipa Lacerda	2017-05-05	2	-1/+5
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '28433-internationalise-cycle-analytics-page' into 'master'	Douwe Maan	2017-05-05	69	-81/+1829
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internationalise Cycle Analytics page Closes #28433 See merge request !10669
\| \| * \| \| \| \| \| \| \|	Some small updates for Spanish translations.	Ruben Davila	2017-05-04	10	-32/+32
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into 28433-internationalise-cycle-analytics-page	Ruben Davila	2017-05-04	395	-1955/+9430
\| \| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
\| * \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-cycle-analytics-stage-legends' into 'master'	Robert Speicher	2017-05-04	3	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wording of Cycle Analytics stage legends See merge request !11106
\| \| * \| \| \| \| \| \| \| \|	Fix wording of Cycle Analytics stage legends	Douwe Maan	2017-05-04	3	-3/+3
\| \|/ / / / / / / / /