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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replace $.get in render math with axiosaxios-get-render-math	Clement Ho	2018-01-30	1	-13/+25
\|
*	Merge branch '21554-mark-new-user-as-external' into 'master'	Douwe Maan	2018-01-30	3	-10/+27
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Login via OAuth marked as "external" should only mark new users as "external", not existing ones Closes #21554 See merge request gitlab-org/gitlab-ce!16672
\| *	Only new users get marked as external21554-mark-new-user-as-external	Tiago Botelho	2018-01-30	3	-10/+27
\| \|
* \|	Merge branch ↵	Douwe Maan	2018-01-30	3	-0/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master' Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
\| * \|	Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass	Sean McGivern	2018-01-30	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It appears that some legacy diff notes on GitLab.com have invalid line codes, which means truncated_diff_lines won't work. This is just a band-aid solution, as neither the diff nor the discussion will display correctly for these notes, but they won't cause a 500 error.
* \| \|	Merge branch 'qa-speedup-new-subgroup-click' into 'master'	Grzegorz Bizon	2018-01-30	1	-1/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed-up the click on 'New subgroup' if the 'No results' text is shown See merge request gitlab-org/gitlab-ce!16803
\| * \| \|	Speed-up the click on 'New subgroup' if the 'No results' text is shownqa-speedup-new-subgroup-click	Rémy Coutable	2018-01-30	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'qa-define-selectors' into 'master'	Grzegorz Bizon	2018-01-30	3	-28/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define QA selectors and remove EE only code Closes gitlab-qa#154 See merge request gitlab-org/gitlab-ce!16767
\| * \ \ \	Merge branch 'master' into 'qa-define-selectors'qa-define-selectors	Lin Jen-Shin	2018-01-30	86	-661/+1351
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \|	# Conflicts: # qa/qa/page/group/show.rb
\| * \| \| \|	Define selectors and remove EE only code	Lin Jen-Shin	2018-01-29	3	-34/+42
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ban-rugged-from-repository' into 'master'	Sean McGivern	2018-01-30	6	-82/+107
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decouple more of Repository from Rugged Closes gitaly#969 See merge request gitlab-org/gitlab-ce!16763
\| * \| \| \| \|	Decouple more of Repository from Rugged	Jacob Vosmaer (GitLab)	2018-01-30	6	-82/+107
\|/ / / / /
* \| \| \| \|	Merge branch 'jprovazn-pagination' into 'master'	Sean McGivern	2018-01-30	2	-5/+27
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make pagination optional for issuables See merge request gitlab-org/gitlab-ce!16774
\| * \| \| \| \|	Make pagination optional for issuables	Jan Provaznik	2018-01-30	2	-5/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On epics roadmap page we list all epics in the given time frame without pagination (at least for the first iteration), in this case it would be nice to use the existing issuables index logic except pagination (see MR gitlab-ee!4281). For this reason this patch allows to easily disable pagination. Related gitlab-ee!4281
* \| \| \| \| \|	Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'	Sean McGivern	2018-01-30	4	-3/+23
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check MR state before submitting queries for discussion state Closes #42236 See merge request gitlab-org/gitlab-ce!16788
\| * \| \| \| \|	Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-state	Oswaldo Ferreira	2018-01-29	4	-3/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rc/port-ee-4064' into 'master'	Rémy Coutable	2018-01-30	11	-7/+190
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port changes from gitlab-org/gitlab-ee!4064 to CE See merge request gitlab-org/gitlab-ce!16796
\| * \| \| \| \| \|	Port changes from gitlab-org/gitlab-ee!4064 to CE	Rémy Coutable	2018-01-30	11	-7/+190
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '42569-lint-changelog-yaml-script-is-run-twice-in-ci' into 'master'	Grzegorz Bizon	2018-01-30	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job Closes #42569 See merge request gitlab-org/gitlab-ce!16790
\| * \| \| \| \| \|	Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in ↵42569-lint-changelog-yaml-script-is-run-twice-in-ci	Rémy Coutable	2018-01-30	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the 'docs lint' job Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'ph-ajax-into-axios' into 'master'	Filipa Lacerda	2018-01-30	8	-143/+180
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More $.ajax conversions to axios See merge request gitlab-org/gitlab-ce!16761
\| * \| \| \| \| \| \|	cache jQuery selectorph-ajax-into-axios	Phil Hughes	2018-01-30	1	-5/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed issuable_spec.js	Phil Hughes	2018-01-29	1	-4/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted integration_settings_form to axios	Phil Hughes	2018-01-29	2	-75/+101
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted issuable_bulk_update_actions to axios	Phil Hughes	2018-01-29	1	-9/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted issuable_index to axios	Phil Hughes	2018-01-29	1	-13/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted group_label_subscription to axios	Phil Hughes	2018-01-29	1	-14/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted graphs_show to axios	Phil Hughes	2018-01-29	1	-7/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted gl_dropdown to axios	Phil Hughes	2018-01-29	1	-19/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update-create-item-dropdown-with-create-new-item-option' into ↵	Filipa Lacerda	2018-01-30	2	-44/+139
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown` See merge request gitlab-org/gitlab-ce!16699
\| * \| \| \| \| \| \|	Add createNewItemFromValue option and clearDropdown methodupdate-create-item-dropdown-with-create-new-item-option	Eric Eastwood	2018-01-30	2	-44/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
* \| \| \| \| \| \| \|	Merge branch 'axios-get-single-file-diff' into 'master'	Filipa Lacerda	2018-01-30	2	-18/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.get in single file diff with axios See merge request gitlab-org/gitlab-ce!16696
\| * \| \| \| \| \| \| \|	Replace $.get in single file diff with axios	Clement Ho	2018-01-30	2	-18/+15
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'axios-post-label-manager' into 'master'	Fatih Acet	2018-01-30	1	-18/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.post in label manager with axios See merge request gitlab-org/gitlab-ce!16695
\| * \| \| \| \| \| \| \|	Remove unnecessary returnaxios-post-label-manager	Clement Ho	2018-01-24	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Replace $.post in label manager with axios	Clement Ho	2018-01-24	1	-18/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-01-30	1	-11/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc: Correct example responses in repository_files.md See merge request gitlab-org/gitlab-ce!16754
\| * \| \| \| \| \| \| \| \|	doc: Correct example responses in repository_files.md	kasbah	2018-01-27	1	-11/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-01-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update index.md See merge request gitlab-org/gitlab-ce!16733
\| * \| \| \| \| \| \| \| \|	Update index.md	Muhamed	2018-01-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'grape-router-helpers-bugfix' into 'master'	Rémy Coutable	2018-01-30	2	-0/+30
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grape-route-helper route shadowing See merge request gitlab-org/gitlab-ce!16781
\| * \| \| \| \| \| \| \| \| \|	Fix grape-route-helper route shadowinggrape-router-helpers-bugfix	Mario de la Ossa	2018-01-29	2	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a monkey patch since the grape-route-helpers project seems to be abandoned
* \| \| \| \| \| \| \| \| \| \|	Merge branch '41802-add-space-to-edit-delete-tag-btns' into 'master'	Filipa Lacerda	2018-01-30	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Missing space between edit and delete buttons in tag list" Closes #41802 See merge request gitlab-org/gitlab-ce!16757
\| * \| \| \| \| \| \| \| \| \| \|	Adds spacing between edit and delete btn in tag list	Jacopo	2018-01-28	2	-1/+6
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.4.2	Mark Fletcher	2018-01-30	7	-31/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-prometheus-empty-state-no-data' into 'master'	Phil Hughes	2018-01-30	2	-3/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add noData empty state to Prometheus graphs Closes #42558 See merge request gitlab-org/gitlab-ce!16777
\| * \| \| \| \| \| \| \| \| \| \|	add noData empty state to prometheus graphsfix-prometheus-empty-state-no-data	Mike Greiling	2018-01-29	2	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-jira-trailing-slash' into 'master'	Robert Speicher	2018-01-30	3	-1/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix JIRA not working when a trailing slash is included Closes #42494 See merge request gitlab-org/gitlab-ce!16748
\| * \| \| \| \| \| \| \| \| \| \|	Fix JIRA not working when a trailing slash is included	Stan Hu	2018-01-29	3	-1/+29
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Leaving a trailing slash in the context option causes the jira-ruby gem to add an extra slash in HTTP requests to the URL, preventing JIRA from working properly. Closes #42494
* \| \| \| \| \| \| \| \| \| \|	Merge branch '41972-make-sure-no-warnings' into 'master'	Robert Speicher	2018-01-29	29	-106/+332
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fail static-analysis if there's output to stderr Closes #41972 See merge request gitlab-org/gitlab-ce!16648