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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove gitlab_meta gemrs-remove-gitlab_meta	Robert Speicher	2016-09-25	2	-7/+1
\|
*	Merge branch 'patch-5' into 'master'	Achilleas Pipinellis	2016-09-25	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in README.md ## What does this MR do? Fixes a typo in the documentation of the gitlab-ci-runner environment variables See merge request !6340
\| *	Fix typo in README.md	Johan Brandhorst	2016-09-14	1	-1/+1
\| \|
* \|	Merge branch 'update-changelog' into 'master'	Rubén Dávila Santos	2016-09-24	1	-1/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG. cc: @stanhu See merge request !6505
\| * \|	Fix CHANGELOG.	Ruben Davila	2016-09-24	1	-1/+4
\|/ /
* \|	Merge branch 'gitlab-ce-milestone-tab-badges' into 'master'	Fatih Acet	2016-09-24	7	-11/+98
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestone tab badges ### What does this MR do? Adds count badges to the tabs on the Milestone page to mirror the Issue page. ### Are there points in the code the reviewer needs to double check? CSS: Padding was added to the `.milestone` element to make expired milestones look good. ### Why was this MR needed? For consistency with other tabs ### What are the relevant issue numbers? Closes #20114 ### Screenshots (if relevant) Before <img src="/uploads/1f75853a863a9058ee409916b7ee4057/Screen_Shot_2016-07-22_at_13.22.20.png" width="362"> After <img src="/uploads/8a058290850f571db249dd9b23f5138d/Screen_Shot_2016-07-22_at_13.21.58.png" width="303"> ![Screen_Shot_2016-08-23_at_1.42.56_AM](/uploads/b072dc6bdf505b2fce46660beaf0eae7/Screen_Shot_2016-08-23_at_1.42.56_AM.png) ![Screen_Shot_2016-08-23_at_1.43.15_AM](/uploads/e7440bf2aa628aa4dba63863083699c0/Screen_Shot_2016-08-23_at_1.43.15_AM.png) ### 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 - [x] Added for this feature/bug - [x] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5946
\| * \|	Ensure milestone counts work with no datagitlab-ce-milestone-tab-badges	Alfredo Sumaran	2016-09-07	2	-23/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Commit originally written by @smcgivern
\| * \|	Fix failing specs and improve html	Alfredo Sumaran	2016-09-07	5	-15/+26
\| \| \|
\| * \|	Added a small helper to reduce logic in the view	Dan Rowden	2016-09-07	2	-3/+14
\| \| \|
\| * \|	Take out of /dashboard/milestones as the helper query clashes with kaminari ↵	Dan Rowden	2016-09-07	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \|	arrays
\| * \|	Updated milestone count helper plus tests	Dan Rowden	2016-09-07	4	-5/+43
\| \| \|
\| * \|	Use newer hash style	Dan Rowden	2016-09-07	2	-6/+6
\| \| \|
\| * \|	Improved milestone counts with a single query	Dan Rowden	2016-09-07	2	-14/+15
\| \| \|
\| * \|	Changeling	Dan Rowden	2016-09-07	1	-0/+3
\| \| \|
\| * \|	Show badges in Milestone tabs and padding in Milestone list (both to match ↵	Dan Rowden	2016-09-07	3	-6/+26
\| \| \| \| \| \| \| \| \| \| \| \|	Issues page)
* \| \|	Merge branch 'flash-container-z-index' into 'master'	Fatih Acet	2016-09-24	1	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed z-index from flash container ## What does this MR do? Fixes a styling bug where the flash container would be above the header when scrolling. Before it looked like this when scrolling: ![Screen_Shot_2016-09-08_at_14.06.36](/uploads/d639287329643d26454a997e3917bc53/Screen_Shot_2016-09-08_at_14.06.36.png) Now it looks like this when scrolling: ![Screen_Shot_2016-09-08_at_14.07.37](/uploads/7c1c5e38adc9b9011558d4190d3520fe/Screen_Shot_2016-09-08_at_14.07.37.png) ## Are there points in the code the reviewer needs to double check? I can't think of any good reason why this would need to be above another element. But you never know! Closes #20713 See merge request !6264
\| * \| \|	Removed z-index from flash containerflash-container-z-index	Phil Hughes	2016-09-08	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes styling error where the flash container would end up above the header when scrolling
* \| \| \|	Merge branch ↵	Fatih Acet	2016-09-24	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-svg-instead-of-container' into 'master' Fixed pipeline stage svg link tooltip ## What does this MR do? Adds `display: block` to the `.stage-container` class which allows the dimensional constraints of the link to be calculated correctly so the `mouseover` events are fired correctly. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Hovering the stage icons to reveal their SVG was buggy and would flash. ## Screenshots (if relevant) ![2016-09-23_14.59.17](/uploads/ad4c85fb08f032cc3f5d17749d3f7091/2016-09-23_14.59.17.gif) I just realised that Gifox actually adds its own mouse that isn't positioned or sized correctly so this doesn't look right, you'll have to `checkout` to confirm. /cc @dimitrieh I found a con about Gifox! :laughing: ## 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 #22459 See merge request !6494
\| * \| \| \|	Changed links that wrap the icon svg to `display: block` so there isn't any ↵22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-svg-instead-of-container	Luke Bennett	2016-09-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues knowing when `mouseover` occurs
* \| \| \| \|	Merge branch 'fix/memory-leak-sanitization-filter' into 'master'	Yorick Peterse	2016-09-23	2	-32/+33
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST See merge request !6456
\| * \| \| \| \|	Fix the leak mentioned in 504a3b5 by another way	Ahmad Sherif	2016-09-23	2	-29/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous fix introduced another leak; as it made Banzai::Filter::SanitizationFiler#customized? always return false, so we were always appending two elements to HTML::Pipeline::SanitizationFilter::WHITELIST[:elements]. This growth in the elements array would slow the sanitization process over time.
\| * \| \| \| \|	Revert "Fix a memory leak caused by Banzai::Filter::SanitizationFilter"	Ahmad Sherif	2016-09-23	1	-3/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 504a3b5e6f0b2e2957cf1e4d9d8eebbf32234bdb.
* \| \| \| \|	Merge branch 'zj-link-broadcast-api-docs' into 'master'	Robert Speicher	2016-09-23	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to broadcast messages docs [ci skip] See merge request !6495
\| * \| \| \| \|	Add link to broadcast messages docs	Z.J. van de Weg	2016-09-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #22508 [ci skip]
* \| \| \| \| \|	Merge branch 'fix/database-seeds' into 'master'	Rémy Coutable	2016-09-23	4	-18/+28
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix database seeds for development environment ## What does this MR do? This MR fixes database seeds for development environment and adds CI test for it. ## Why was this MR needed? Database seeds for development environment are often broken, and we are not able to catch that when someone modified `db/fixtures` and forgets to reseed database. Closes #22422 See merge request !6475
\| * \| \| \| \|	Remove use of `USE_DB` environment variable in codefix/database-seeds	Grzegorz Bizon	2016-09-23	1	-3/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Limit test environment size to one project in CI	Grzegorz Bizon	2016-09-23	2	-10/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Update `CurrentSettings` class that uses ENV	Grzegorz Bizon	2016-09-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Improve CI job that tests database seeds	Grzegorz Bizon	2016-09-22	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Try cloning repositories before seeding database	Grzegorz Bizon	2016-09-22	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Seeding database requires gitlab-shell, and we would like to avoid adding this dependency to the CI.
\| * \| \| \| \|	Add artifacts with development log when seed fails	Grzegorz Bizon	2016-09-22	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix pipeline fixtures for development environment	Grzegorz Bizon	2016-09-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add development environment database setup CI test	Grzegorz Bizon	2016-09-22	1	-6/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Fix CHANGELOG double-update	Rémy Coutable	2016-09-23	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce	Rémy Coutable	2016-09-23	5	-9/+25
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'fix/speed-up-group-milestone-show' into 'master'	Yorick Peterse	2016-09-23	5	-10/+26
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up group milestones show page See merge request !6457
\| \| * \| \| \| \| \|	Update CHANGELOGfix/speed-up-group-milestone-show	Ahmad Sherif	2016-09-23	1	-2/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Use select(:foo) instead of map(&:foo) in GlobalMilestone	Ahmad Sherif	2016-09-23	1	-3/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Ensure milestones passed to GlobalMilestone is an ActiveRecord::Relation	Ahmad Sherif	2016-09-23	2	-15/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Reduce number of queries when calling GlobalMilestone#{labels,participants}	Ahmad Sherif	2016-09-23	2	-2/+13
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Eager-load assignee and labels associations for GlobalMilestore issuables	Ahmad Sherif	2016-09-23	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add index on labels title	Ahmad Sherif	2016-09-23	2	-1/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Prepare CHANGELOG for 8.12.1 & 8.13.0	Rémy Coutable	2016-09-23	1	-1/+5
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'cycle-analytics-js-improvements' into 'master'	Jacob Schatz	2016-09-23	2	-18/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Cycle Analytics landing widget state and improve state management in Vue. ## What does this MR do? - Fixes Cycle Analytics help widget show/hide issue - Addresses initial MR feedback with improving Vue state management logic - Fixes cookie path of the help widget so when you close a help widget in a repo it won't be visible for other repos. ## Are there points in the code the reviewer needs to double check? - Should we move `gl.cycleAnalyticsModel` to a new file. ## Why was this MR needed? - Addresses feedbacks of [initial MR](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5986) and fixes #22483 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Fixes #22483 See merge request !6492
\| * \| \| \| \| \| \|	Set cookie path for cycle analytics cookie.	Fatih Acet	2016-09-23	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix landing widget state and improve Vue with state management.	Fatih Acet	2016-09-23	2	-17/+16
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'filipa-22444' into 'master'	Fatih Acet	2016-09-23	3	-28/+59
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes Cycle analytics mobile friendly ## What does this MR do? Makes Cycle analytics page mobile friendly ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Cycle analytics page was not mobile friendly ## Screenshots (if relevant) ![optionB](/uploads/a1d7f2f4db100e1a8aa76c0156ef8641/optionB.png) ## 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 - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? fixes #22444 See merge request !6482
\| * \| \| \| \| \| \|	Improves design when in mobile and tablet	Filipa Lacerda	2016-09-23	2	-14/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improvements after reviewfilipa-22444	Filipa Lacerda	2016-09-22	3	-4/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Makes Cycle analytics mobile friendly	Filipa Lacerda	2016-09-22	3	-26/+44
\| \| \| \| \| \| \| \|