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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Be able to bundle gems with newer rubieszj-ruby-2.3.5	Zeger-Jan van de Weg	2017-09-26	1	-1/+1
\|
*	Upgrade ruby version to 2.3.5	Zeger-Jan van de Weg	2017-09-19	4	-5/+10
\| \| \| \|	Part of gitlab-org/gitlab-ce#38040
*	Merge branch 'standardise-small-button-classnames' into 'master'	Tim Zallmann	2017-09-19	11	-14/+13
\|\ \| \| \| \| \| \| \| \|	Change all instances of btn-sm to btn-small to keep things consistent See merge request gitlab-org/gitlab-ce!14113
\| *	Change all instances of btn-sm to btn-small to keep things consistent	Jedidiah	2017-09-19	11	-14/+13
\|/
*	Merge branch 'zj-update-project-settings' into 'master'	Grzegorz Bizon	2017-09-19	3	-3/+46
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291
\| *	Fix instance default option being true as value	Zeger-Jan van de Weg	2017-09-18	2	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user selected 'Instance default' as value for the auto devops settings, this was interpreted as a true value. Now we post an empty string in this case, meaning we want to set `NULL` in the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294
\| *	Remove changelog entry	Zeger-Jan van de Weg	2017-09-15	1	-5/+0
\| \|
\| *	Allow updating of project auto devops settings	Zeger-Jan van de Weg	2017-09-15	3	-1/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating didn't work, as the project_id was missing to be set for the project_auto_devops model. Fixes gitlab-org/gitlab-ce#37893
* \|	Merge branch '34259-project-denial-of-service-via-gitmodules-fix' into 'master'	Robert Speicher	2017-09-19	3	-4/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes project denial of service via gitmodules using Extended ASCII. Closes #34259 See merge request gitlab-org/gitlab-ce!14301
\| * \|	Fixes project denial of service via gitmodules using Extended ASCII.34259-project-denial-of-service-via-gitmodules-fix	Tiago Botelho	2017-09-15	3	-4/+19
\| \| \|
* \| \|	Merge branch 'repo-editor-ui-fix' into 'master'	Jacob Schatz	2017-09-19	2	-16/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repo editor UI fixes part 2 Closes #37830, #36247, #37829, and #36244 See merge request gitlab-org/gitlab-ce!14261
\| * \| \|	RepoEditor: Add hover color for the close icon.repo-editor-ui-fix	Fatih Acet	2017-09-14	1	-0/+4
\| \| \| \|
\| * \| \|	RepoEditor: Fix height of the file list.	Fatih Acet	2017-09-14	1	-1/+0
\| \| \| \|
\| * \| \|	RepoEditor: Fix target branch dropdown styling.	Fatih Acet	2017-09-14	1	-12/+8
\| \| \| \|
\| * \| \|	RepoEditor: Improve tab spacing and styling.	Fatih Acet	2017-09-14	1	-3/+2
\| \| \| \|
* \| \| \|	Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'	Fatih Acet	2017-09-19	10	-25/+157
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
\| * \| \| \|	Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-services	Eric Eastwood	2017-09-18	10	-25/+157
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
* \| \| \|	Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'	Fatih Acet	2017-09-18	4	-3/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
\| * \| \| \|	Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixes	Eric Eastwood	2017-09-13	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259
* \| \| \| \|	Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'	Annabel Dunstone Gray	2017-09-18	3	-2/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
\| * \| \| \| \|	Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-icon	Eric Eastwood	2017-09-13	3	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37465 Related MRs - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13821 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14042
* \| \| \| \| \|	Merge branch '35290_allow_public_project_apis' into 'master'	Rémy Coutable	2017-09-18	4	-6/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #35290 Make read-only API for public merge requests available without authentication Closes #35290 See merge request gitlab-org/gitlab-ce!13291
\| * \| \| \| \| \|	fix #35290 Make read-only API for public merge requests available without ↵	haseeb	2017-09-18	4	-6/+40
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authentication
* \| \| \| \| \|	Merge branch 'add_closed_at_attribute' into 'master'	Rémy Coutable	2017-09-18	5	-2/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'closed_at' attribute to Issues API Closes #5935 See merge request gitlab-org/gitlab-ce!14316
\| * \| \| \| \| \|	Add 'closed_at' attribute to Issues API	Vitaliy @blackst0ne Klachkov	2017-09-16	5	-2/+26
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-optimize-discussion-json' into 'master'	Yorick Peterse	2017-09-18	4	-3/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in loading discussions.json endpoint Closes #37955 See merge request gitlab-org/gitlab-ce!14327
\| * \| \| \| \| \| \|	Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-json	Stan Hu	2017-09-18	4	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In #37955,we see that the profile had a number of N+1 queries from repeated access to `cross_reference_not_visible_for?`. This was optimized in previous versions of GitLab by rendering all notes at once, counting the number of visible references, and then using that number to check whether a system note should be fully redacted. There was also another N+1 query calling `ProjectTeam#member?`, which did not take advantage of an optimization in prepare_notes_for_rendering that would preload the maximum access level per project. Closes #37955
* \| \| \| \| \| \| \|	Merge branch '37590-pipelines-mr' into 'master'	Annabel Dunstone Gray	2017-09-18	2	-0/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mini graph pipeline breaking in merge request view Closes #37590 See merge request gitlab-org/gitlab-ce!14306
\| * \| \| \| \| \| \| \|	Fix mini graph pipeline breakin in merge request view37590-pipelines-mr	Filipa Lacerda	2017-09-15	2	-0/+10
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-missing-javascript-imports' into 'master'	Tim Zallmann	2017-09-18	3	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing import statements See merge request gitlab-org/gitlab-ce!14209
\| * \| \| \| \| \| \| \|	Add missing import statementswinh-missing-javascript-imports	winh	2017-09-18	3	-0/+5
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'milestone-avatar-issuable-link' into 'master'	Tim Zallmann	2017-09-18	3	-1/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes milestone issuable assignee URL Closes #33124 See merge request gitlab-org/gitlab-ce!14292
\| * \| \| \| \| \| \| \|	Fixes milestone issuable assignee URLmilestone-avatar-issuable-link	Phil Hughes	2017-09-15	3	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33124
* \| \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-09-18	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37933-improve-new-project-page-description-explaining-what-a-project-is' into 'master' Resolve "Improve “New project“ page description explaining what a project is" Closes #37933 See merge request gitlab-org/gitlab-ce!14331
\| * \| \| \| \| \| \| \| \|	Improve “New project“ page description37933-improve-new-project-page-description-explaining-what-a-project-is	Pedro Moreira da Silva	2017-09-18	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain what a project is instead of what a user can do
* \| \| \| \| \| \| \| \| \|	Merge branch '37789-followup-for-read-registry-change' into 'master'	Rémy Coutable	2017-09-18	7	-20/+28
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
\| * \| \| \| \| \| \| \| \| \|	Clean up read_registry scope changes	Robin Bobbitt	2017-09-18	7	-20/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #37789
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-17499-documentation-errors-about-creating-a-new-tag' into ↵	Achilleas Pipinellis	2017-09-18	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix docs for lightweight tag creation via API Closes #17499 See merge request gitlab-org/gitlab-ce!14328
\| * \| \| \| \| \| \| \| \| \| \|	Fix docs for lightweight tag creation via API	Mark Fletcher	2017-09-18	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-label-message' into 'master'	Rémy Coutable	2017-09-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notification message when admin label was modified See merge request gitlab-org/gitlab-ce!14330
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix notification message when admin label was modifiedfix-label-message	Robert Schilling	2017-09-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-user_uses_slash_commands_spec' into 'master'	Rémy Coutable	2017-09-18	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor update to address Sean McGivern's comment. See merge request gitlab-org/gitlab-ce!14311
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Minor update to address Sean McGivern's comment.	manolis	2017-09-15	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More details are available here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13436/diffs#note_39115837
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace_project_snippets.feature' into 'master'	Rémy Coutable	2017-09-18	7	-135/+95
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/snippets.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14326
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/snippets.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-18	7	-135/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '37957-fix-groups-members-flyout-link' into 'master'	Phil Hughes	2017-09-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use correct group members path for members flyout link Closes #37957 See merge request gitlab-org/gitlab-ce!14329
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Use correct group members path for members flyout link37957-fix-groups-members-flyout-link	kushalpandya	2017-09-18	1	-1/+1
\| \|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix_wiki_md' into 'master'	Achilleas Pipinellis	2017-09-18	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in docs/api/wiki.md See merge request gitlab-org/gitlab-ce!14296
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in docs/api/wiki.md	Vitaliy @blackst0ne Klachkov	2017-09-17	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'operation-service-merge' into 'master'	Rémy Coutable	2017-09-18	8	-78/+76
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare Repository#merge for migration to Gitaly Closes gitaly#559 See merge request gitlab-org/gitlab-ce!14154