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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make specs a bit fasterspec_optimization	Valery Sizov	2016-11-01	7	-66/+90
\|
*	Merge branch 'add-link-to-issue-boards-in-api-readme' into 'master'	Achilleas Pipinellis	2016-11-01	1	-0/+1
\|\ \| \| \| \| \| \| \| \|	Add a link to the Issue Boards API in main README See merge request !7221
\| *	Add a link to the Issue Boards API in main README	Achilleas Pipinellis	2016-11-01	1	-0/+1
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'blacklist-osl' into 'master'	Robert Speicher	2016-11-01	2	-0/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Blacklist the OSL 3.0 license See merge request !7171
\| * \|	Add OSL to licensing docblacklist-osl	Sean McGivern	2016-10-31	1	-0/+3
\| \| \|
\| * \|	Blacklist the OSL 3.0 license	Sean McGivern	2016-10-28	1	-0/+7
\| \| \|
* \| \|	Merge branch 'active-element-tooltip' into 'master'	Fatih Acet	2016-11-01	2	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show tooltip for active element ## What does this MR do? Change Bootstrap's default for tooltips to display them only when hovering and not for the active element. See also here: https://getbootstrap.com/javascript/#tooltips-options ## Screenshots ### Before ![before](/uploads/c5b7bd9eba07ca61bfa5ba014d08dd1a/before.webm) ### After ![after](/uploads/d8c4a69e5a6797d8d26ab92cb96fcb2d/after.webm) ## What are the relevant issue numbers? Closes #23794 See merge request !7105
\| * \| \|	Do not show tooltip for active element (!7105)	winniehell	2016-11-01	2	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'panjan/gitlab-ce-reference_links_styling' into 'master'	Sean McGivern	2016-11-01	12	-75/+174
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown styling inside reference links Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18096. Based off https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6609. See merge request !7169
\| * \| \| \|	Fix Markdown styling inside reference links	panjan	2016-11-01	12	-75/+174
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/18096
* \| \| \| \|	Merge branch 'api-projects-fix-mdlink' into 'master'	Sean McGivern	2016-11-01	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project visibility level link Fix wrong syntax for link generation. See merge request !7201
\| * \| \| \| \|	Fix project visibility level link	Andrea Scarpino	2016-10-31	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-9' into 'master'	Sean McGivern	2016-11-01	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update tags.md See merge request !7202
\| * \| \| \| \|	Update tags.md	Roman Pickl	2016-10-31	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'optimize/labels-finder' into 'master'	Sean McGivern	2016-11-01	10	-28/+41
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize group labels page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23684 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1148 See merge request !7123
\| * \| \| \| \|	Update CHANGELOGoptimize/labels-finder	Douglas Barbosa Alexandre	2016-10-31	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Assign local_assigns[:subject] to a variable on the shared label partial	Douglas Barbosa Alexandre	2016-10-31	1	-4/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Use select instead of pluck on Project.group_ids	Douglas Barbosa Alexandre	2016-10-31	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Skip authorization check when searching for labels on IssuableFinder	Douglas Barbosa Alexandre	2016-10-31	2	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Use label subject to calculate number of issues/mrs within the group	Douglas Barbosa Alexandre	2016-10-31	7	-25/+33
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unnecessary includes(:priorities) on Projects::LabelsController	Douglas Barbosa Alexandre	2016-10-31	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'mr-copy-filename-btn-update' into 'master'	Fatih Acet	2016-11-01	3	-2/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated positioning of copy file path button in diffs ## What does this MR do? Updated the positioning of the copy file path button in diffs. ## Screenshots (if relevant) ![Screen_Shot_2016-10-31_at_16.53.24](/uploads/53de39ce550855f86b90d2d9fc227f95/Screen_Shot_2016-10-31_at_16.53.24.png) ## What are the relevant issue numbers? Closes #23591 See merge request !7203
\| * \| \| \| \|	Updated positioning of copy file path button in diffsmr-copy-filename-btn-update	Phil Hughes	2016-10-31	3	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23591
* \| \| \| \| \|	Merge branch 'zj-grape-branches' into 'master'	Rémy Coutable	2016-11-01	2	-78/+57
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GrapeDSL for branches endpoints No changelog item as it doesn't change behaviour Cherry-picket from !6330 See merge request !6630
\| * \| \| \| \| \|	GrapeDSL for branches endpointszj-grape-branches	Z.J. van de Weg	2016-10-31	2	-78/+57
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-8' into 'master'	Fatih Acet	2016-10-31	1	-3/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ES array methods as cause of Phantom.js errors. ## What does this MR do? Adds another example of something that causes a common error in JavaScript testing to the frontend dev docs. See merge request !7102
\| * \| \| \| \| \| \|	Add ES array methods as cause of Phantom.js errors.	Bryce Johnson	2016-10-26	1	-3/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '20892-commit-info' into 'master'	Fatih Acet	2016-10-31	12	-62/+156
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clean up commit meta info view" Updates commit page design Before: ![Screen_Shot_2016-10-19_at_10.20.10_AM](/uploads/8737a9db01bffc019d8b2c71a943024b/Screen_Shot_2016-10-19_at_10.20.10_AM.png) After: ![Screen_Shot_2016-10-19_at_10.20.01_AM](/uploads/716cb902bd20dedc705a8f81f6536736/Screen_Shot_2016-10-19_at_10.20.01_AM.png) ![Screen_Shot_2016-10-19_at_10.27.01_AM](/uploads/4228575f50990a88bc828037d8fb99f2/Screen_Shot_2016-10-19_at_10.27.01_AM.png) Closes #20892 See merge request !6994
\| * \| \| \| \| \| \|	Fix rubocop offenses20892-commit-info	Annabel Dunstone Gray	2016-10-28	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add commit_box spec	Annabel Dunstone Gray	2016-10-28	1	-0/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Display last pipeline info	Annabel Dunstone Gray	2016-10-28	2	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix commits spec	Annabel Dunstone Gray	2016-10-28	2	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix mobile view	Annabel Dunstone Gray	2016-10-28	2	-6/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Finish styling commits view	Annabel Dunstone Gray	2016-10-28	9	-31/+85
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rearrange commit info view	Annabel Dunstone Gray	2016-10-28	2	-33/+49
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add 8.13.2 CHANGELOG entriessh-test-push	Rémy Coutable	2016-10-31	1	-212/+223
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'issue_23951' into 'master'	Sean McGivern	2016-10-31	3	-1/+22
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix builds tab visibility closes #23951 See merge request !7178
\| * \| \| \| \| \| \|	Fix builds tab visibilityissue_23951	Felipe Artur	2016-10-31	3	-1/+22
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-retry-limit-project-webhook'	Douwe Maan	2016-10-31	1	-0/+2
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' into 'add-retry-limit-project-webhook'add-retry-limit-project-webhook	Douwe Maan	2016-10-31	660	-2589/+7446
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/workers/project_web_hook_worker.rb
* \| \| \| \| \| \| \|	Merge branch '22271-drone-tag-pipeline-build' into 'master'	Douwe Maan	2016-10-31	18	-87/+161
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix lightweight tags not processed correctly by GitTagPushService ## What does this MR do? Fix lightweight tags not processed correctly by GitTagPushService ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Lightweight tags were being processed incorrectly, causing tag triggers to receive wrong information and not function properly. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22271 See merge request !6532
\| * \| \| \| \| \| \|	Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-build	Alejandro Rodríguez	2016-10-28	18	-87/+161
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing to the sha of the tag to the sha of the commit the tag points to. The problem is that only annotated tags have `object_sha`s, lightweight tags don't (it's nil), so (only) in their case we still need to use `tag.target`.
* \| \| \| \| \| \| \|	Merge branch '23106-events-default-scope-results-in-a-slow-query' into 'master'	Yorick Peterse	2016-10-31	5	-5/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize Event queries by removing default order See merge request !7130
\| * \| \| \| \| \| \| \|	Optimize Event queries by removing default order23106-events-default-scope-results-in-a-slow-query	Alejandro Rodríguez	2016-10-27	5	-5/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'lfs_object_removal' into 'master'	Sean McGivern	2016-10-31	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unreferenced LFS objects from DB and fs Fixes #3666 See merge request !5901
* \ \ \ \ \ \ \ \ \	Merge branch 'lfs_object_removal' into 'master' 23858-task-lists	Sean McGivern	2016-10-31	5	-0/+73
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unreferenced LFS objects from DB and fs Fixes #3666 See merge request !5901
\| * \| \| \| \| \| \| \| \|	Remove unreferenced LFS objects from DB and fs	Frank Groeneveld	2016-10-28	5	-0/+73
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dz-bump-gitlab-shell' into 'master'	Dmitriy Zaporozhets	2016-10-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell version to 4.0.0 New version includes https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/102 and needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7200
\| * \| \| \| \| \| \| \| \|	Bump gitlab-shell version to 4.0.0dz-bump-gitlab-shell	Dmitriy Zaporozhets	2016-10-31	1	-1/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'patch-4' into 'master'	Sean McGivern	2016-10-31	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve docs on `gitlab-ci-token` user See merge request !6002