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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge branch ↵	Alejandro Rodríguez	2016-07-24	5	-19/+16
\| \| \| \| \|	'17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" This reverts merge request !5375
*	Merge branch 'nullify-note-type' into 'master'	Stan Hu	2016-07-23	1	-5/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where replies to commit notes displayed in the MR discussion tab wouldn'… Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20157 See merge request !5446
\| *	Fix bug where replies to commit notes displayed in the MR discussion tab ↵	Douwe Maan	2016-07-23	1	-5/+9
\| \| \| \| \| \| \| \|	wouldn't show up on the commit page
* \|	Merge branch 'add-gitlab-workhorse-version-to-admin-dashboard' into 'master'	Douwe Maan	2016-07-23	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add gitlab-workhorse version to admin dashboard ## What does this MR do? Add gitlab-workhorse version to admin dashboard. ## What are the relevant issue numbers? Closes #15418 ## Screenshot ![Zrzut_ekranu_2016-07-20_o_23.20.55](/uploads/ba6761e2145d903ac87bc7198bc8b182/Zrzut_ekranu_2016-07-20_o_23.20.55.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Add test - show Gitlab Workhorse version on Admin Dashboard - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) cc @ubudzisz @yorickpeterse @grzesiek [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5321
\| * \|	Add gitlab-workhorse version to admin dashboard	Katarzyna Kobierska	2016-07-23	1	-0/+4
\| \|/ \| \| \| \| \| \| \| \| \| \|	Test for showing GitLab Workhorse version on Admin Dashboard Refactoring
* \|	Merge branch 'improve-rename-logging' into 'master'	Robert Speicher	2016-07-23	1	-1/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve project rename log messages for better debugging This should help diagnose issues such as #20178. See merge request !5450
\| * \|	Improve project rename log messages for better debuggingimprove-rename-logging	Stan Hu	2016-07-23	1	-1/+10
\| \|/ \| \| \| \| \| \|	Helping to diagnose #20178
* \|	Merge branch 'dz-avatar-border' into 'master'	Dmitriy Zaporozhets	2016-07-23	4	-15/+13
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add light border to rounded avatars Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20128 To make it clear that avatar is cropped by border radius cc @hazelyang See merge request !5429
\| *	Add light border to rounded avatarsdz-avatar-border	Dmitriy Zaporozhets	2016-07-22	4	-15/+13
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'preserve_repo_ref_param' into 'master'	Robert Speicher	2016-07-22	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing repo_ref param Closes #19444 See merge request !5435
\| * \|	fix missing repo_ref param	barthc	2016-07-22	1	-1/+2
\| \|/
* \|	Merge branch 'fix/load-project-invited-groups-and-members-eagerly' into ↵	Douwe Maan	2016-07-22	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Load project invited groups and members eagerly in ProjectTeam#fetch_members ## What does this MR do? Load project invited groups and members eagerly in `ProjectTeam#fetch_members`, reducing number of queries to DB. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? `ProjectTeam#fetch_members` is part of the code path of `Participable#raw_participants`, so it should improve its performance a bit. ## What are the relevant issue numbers? #19985 ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [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~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5436
\| * \|	Load project invited groups and members eagerly in ProjectTeam#fetch_membersfix/load-project-invited-groups-and-members-eagerly	Ahmad Sherif	2016-07-22	1	-1/+1
\| \|/
* \|	Gracefully handle case when keep-around references are corrupted or exist ↵handle-invalid-kept-around-references	Stan Hu	2016-07-22	1	-2/+11
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	already We were seeing a number of error messages when attempting to create a keep-around ref: 1. Failed to create locked file `refs/keep-around/XYZ`: File exists 2. Failed to write reference `refs/keep-around/XYZ`: a reference with that name already exists. I'm not sure how these happen, but I suspect when multiple workers attempt to write the same file we may have an issue. The force parameter should help ensure the file gets created, as well as the rescues to prevent 500 Errors. Rugged/libgit2 unfortunately do not allow you to delete or re-create a reference that has been corrupted, even with the force parameter. Closes #20109
*	Merge branch 'doc-protected-branches' into 'master'	Achilleas Pipinellis	2016-07-22	1	-6/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor protected branches documentation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19832 See merge request !5419
\| *	Refactor protected branches documentation	Achilleas Pipinellis	2016-07-22	1	-6/+7
\| \|
* \|	Merge branch 'artifacts-from-ref-and-build-name-api' into 'master'	Rémy Coutable	2016-07-22	1	-7/+7
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simpler two queries than one JOIN with subquery This is a follow up from !5347 Originally it was: ``` ruby pipeline = pipelines.latest_successful_for(ref) builds.where(pipeline: pipeline).latest.with_artifacts ``` However MySQL would complain that we can't use `IN` against a subquery which has `LIMIT`. Using `INNER JOIN` would be a workaround, however, doing that is too complicated in current version of Rails. So let's just use two queries in this case. Closes #14419 See merge request !5388
\| *	Since it's too hard to use JOIN with Rails... feedback:	Lin Jen-Shin	2016-07-21	1	-7/+7
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13204564
* \|	Merge branch ↵	Yorick Peterse	2016-07-21	5	-16/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-seconds' into 'master' Improve performance of tags controller See merge request !5375
\| * \|	Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects	Alejandro Rodríguez	2016-07-21	5	-16/+19
\| \| \|
* \| \|	Merge branch '20046-snippets-menu' into 'master'	Robert Speicher	2016-07-21	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change nav link snippet controller Removes active Snippets nav link state for project-specific snippets Closes #20046 See merge request !5410
\| * \|	Change nav link snippet controller	Annabel Dunstone	2016-07-21	1	-1/+1
\| \| \|
* \| \|	Merge branch 'fix-data-integrity-issue-with-repository-downloads-path' into ↵	Douwe Maan	2016-07-21	3	-11/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Avoid data-integrity issue when cleaning up repository archive cache ## What does this MR do? Sets the default value for `repository_downloads_path` if someone has it configured incorrectly, and it points to the path where repositories are stored. It's also replace invocation of `find` with Ruby code that matches old cached files in a better, and safe way to avoid data-integrity issues. ## Why was this MR needed? The `repository_downloads_path` is used by the `RepositoryArchiveCacheWorker` to remove outdated repository archives, if it points to the wrong directory can cause some data-integrity issue. ## What are the relevant issue numbers? Closes #14222 See merge request !5285
\| * \| \|	Use find instead Ruby to remove files due to performance reasons	Douglas Barbosa Alexandre	2016-07-21	1	-13/+4
\| \| \| \|
\| * \| \|	Add service to clean up repository archive cache	Douglas Barbosa Alexandre	2016-07-21	3	-11/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace invocation of `find` with Ruby code that matches old cached files in a better, and safe way to avoid data-integrity issues.
* \| \| \|	Reduce min width of pipeline table	Annabel Dunstone	2016-07-21	2	-2/+11
\| \|/ / \|/\| \|
* \| \|	Merge branch 'discussion-model' into 'master'	Robert Speicher	2016-07-21	24	-240/+287
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
\| * \| \|	Add Discussion model to represent MR/diff discussiondiscussion-model	Douwe Maan	2016-07-20	24	-240/+287
\| \| \| \|
* \| \| \|	Merge branch 'ui-bug-fixes' into 'master'	Robert Speicher	2016-07-21	9	-12/+46
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI bug fixes Closes #20074 Closes #20094 Regression UI bug fixes * Fix broken status icon on project page * Center tooltip on empty state in pipeline * Reduce max-width of commit title in pipeline so more fits in table * Fixes firefox rendering (icons getting cut off) * Fixes Safari rendering of SHA icon See merge request !5383
\| * \| \| \|	Fix sha icon positioning on safariui-bug-fixes	Annabel Dunstone	2016-07-21	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Mobile view for commit status	Annabel Dunstone	2016-07-21	2	-1/+10
\| \| \| \| \|
\| * \| \| \|	Fix ci icons getting cut off	Annabel Dunstone	2016-07-21	5	-9/+9
\| \| \| \| \|
\| * \| \| \|	Fix firefox rendering of SVGs	Annabel Dunstone	2016-07-21	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix icons on commits page and builds page	Annabel Dunstone	2016-07-21	2	-1/+9
\| \| \| \| \|
\| * \| \| \|	Add new fork SVG to fix weird styling of other SVGs	Annabel Dunstone	2016-07-21	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Bug fixes	Annabel Dunstone	2016-07-21	3	-5/+19
\| \| \|/ / \| \|/\| \|
* \| \| \|	Don't use `params[:id]` while building `markdown_preview_path`.20079-new-wiki-page-500	Timothy Andrew	2016-07-21	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Instead, use `@page.title`, since it's always guaranteed to be around in a wiki. 2. `params[:id]` is _not_ always guaranteed to be around - if a page is created with errors, `render :edit` is called, and `params[:id]` is `nil`. 3. More context: https://gitlab.com/gitlab-org/gitlab-ce/issues/20079#note_13223240
* \| \|	Merge branch '20055-build-duration-showing-too-many-digits' into 'master'	Stan Hu	2016-07-21	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cast duration to integer in `TimeHelper#time_interval_in_words` Fixes #20055. - [x] No CHANGELOG since it fixes a regression introduced in RC12. - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5391
\| * \| \|	Cast duration to integer in `TimeHelper#time_interval_in_words`	Rémy Coutable	2016-07-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '20061-emailsonpushworker-fails-on-new-branch-pushes' into ↵	Rémy Coutable	2016-07-21	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix emails on push for new and deleted branches ## What does this MR do? Fix EmailsOnPushWorker when the push is either a new branch or a deleted branch. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? / What are the relevant issue numbers? Closes #20061. ## Does this MR meet the acceptance criteria? - ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ (regression) - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5390
\| * \| \|	Fix emails on push for new and deleted branches20061-emailsonpushworker-fails-on-new-branch-pushes	Sean McGivern	2016-07-21	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'fix/new-project-import-tooltip' into 'master'	Fatih Acet	2016-07-21	1	-12/+12
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show tooltip on GitLab export link in new project page Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19993 When the project path/name is not filled, we should show a tooltip in the `GitLab export` link, plus a flash message if the user still tries to click on it. - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] 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) See merge request !5363
\| * \| \|	added spec, fixed wording	James Lopez	2016-07-20	1	-3/+3
\| \| \| \|
\| * \| \|	fix JS - now tooltip and flash should show	James Lopez	2016-07-20	1	-9/+9
\| \| \| \|
* \| \| \|	Merge branch 'hide-project-name-in-project-activities' into 'master'	Fatih Acet	2016-07-21	7	-20/+26
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide project name in project activities ## What does this MR do? - hide namespace and project name on project activity page ## Are there points in the code the reviewer needs to double check? - did `.event_label` have any meaning? ## Why was this MR needed? - all events on project activity page are from the same project, so the information was redundant ## What are the relevant issue numbers? closes #18963 ## Screenshots ### Before ![events-before](/uploads/76336e3f5cb08d4ef984df73c89aa90f/events-before.png) ### After ![events-after](/uploads/4a10718ed32960efc115d7854e5cad68/events-after.png) ![after-john-activity](/uploads/d9d151a829d8d32136525e8eb7ea04ad/after-john-activity.png) See merge request !5068
\| * \| \| \|	Hide namespace and project name on project activity page (!5068)	winniehell	2016-07-14	7	-20/+26
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-preview-image-border' into 'master'	Fatih Acet	2016-07-21	3	-29/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add image border in Markdown preview ## What does this MR do? - add image border in Markdown preview like it is show after a comment is saved - fix margin and shade of `<hr>` in Markdown preview ## Are there points in the code the reviewer needs to double check? Is `.md` the right class to use? ## Why was this MR needed? The border was missing. ## What are the relevant issue numbers? fixes #19652 ## Screenshots ### Before ![before](/uploads/683e2af7278c33d29b2a1ae19d1136e3/before.png) ### After ![after](/uploads/07dcee531a5696303cb34b4a88357e8a/after.png) See merge request !5162
\| * \| \| \| \|	Add image border in Markdown preview (!5162)	winniehell	2016-07-21	3	-29/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gl-dropdown-enter-key-fix' into 'master'	Fatih Acet	2016-07-21	1	-1/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dropdown enter key when searching ## What does this MR do? When searching in a dropdown you can now just press the enter key to trigger a click on the first row rather than having to press the down key & then enter. ## What are the relevant issue numbers? Closes #19741 See merge request !5231
\| * \| \| \| \| \|	Fixed issue where using arrow keys would require arrow key to be pressed twicegl-dropdown-enter-key-fix	Phil Hughes	2016-07-20	1	-5/+2
\| \| \| \| \| \| \|