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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix import/export security specs after mergefix/import-security	James Lopez	2016-09-21	3	-1/+15
\|
*	Merge branch 'zj-default-setting-features' into 'master'	Robert Speicher	2016-09-21	1	-0/+6
\|\ \| \| \| \| \| \| \| \|	Add default values for ProjectFeature See merge request !6447
\| *	Remove duplicate default_value_level entryzj-default-setting-features	Zeger-Jan van de Weg	2016-09-21	1	-1/+0
\| \|
\| *	Add default values for ProjectFeature	Z.J. van de Weg	2016-09-21	1	-0/+7
\| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ce#22330
* \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Rémy Coutable	2016-09-21	3	-2/+23
\|\ \
\| * \	Merge branch 'fix/import-security-specs' into 'master'	Rémy Coutable	2016-09-21	3	-2/+23
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Import/Export security specs Related https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1987#note_83855 See merge request !1997
\| \| * \|	fixing security specs after merge	James Lopez	2016-09-21	3	-2/+23
\| \| \| \|
* \| \| \|	Merge branch 'rs-revert-rubocop-rspec-1-7' into 'master'	Robert Speicher	2016-09-21	3	-71/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'" Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6357 due to rubocop-rspec dropping support for Ruby 2.1. See https://github.com/backus/rubocop-rspec/pull/131 See merge request !6444
\| * \| \| \|	Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"rs-revert-rubocop-rspec-1-7	Robert Speicher	2016-09-21	3	-71/+14
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 70faf5fdfbfa0e427b12d4181a9302394974c3cf, reversing changes made to 2307eb84dcd1748cc231719017551111310d1bf9.
* \| \| \|	Merge branch 'and-you-get-awards' into 'master'	Rémy Coutable	2016-09-21	21	-52/+184
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And Snippets get awards ## What does this MR do? Makes snippets more awesome, by making them awardables ## Why was this MR needed? Because Snippets were left behind. ## What are the relevant issue numbers? Closes #17878 See merge request !4456
\| * \| \| \|	Remove duplicate routeand-you-get-awards	Zeger-Jan van de Weg	2016-09-20	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Fix styling of award emoji block for snippets after upstream design changes.	Fatih Acet	2016-09-19	3	-11/+19
\| \| \| \| \|
\| * \| \| \|	Use routing concerns to DRY the routes	Z.J. van de Weg	2016-09-19	1	-9/+9
\| \| \| \| \|
\| * \| \| \|	Fix tests for Snippets toggling awards	Z.J. van de Weg	2016-09-19	8	-939/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also incorporate feedback
\| * \| \| \|	Start Frontend work, fix routing problem	Z.J. van de Weg	2016-09-19	10	-11/+937
\| \| \| \| \|
\| * \| \| \|	API docs for award emoji on Snippets	Z.J. van de Weg	2016-09-19	1	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	API support for Award Emoji on Snippets	Z.J. van de Weg	2016-09-19	3	-16/+71
\| \| \| \| \|
\| * \| \| \|	Snippets get award emoji! :thumbsup:	Z.J. van de Weg	2016-09-19	9	-6/+52
\| \| \| \| \|
* \| \| \| \|	Merge branch 'correct-builds-pipeline-commit-header-to-build-header' into ↵	Fatih Acet	2016-09-21	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Changed `Commit` to `Build` header on builds table ## What does this MR do? As [discussed here](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6322#note_15511777) the pipeline table `Commit` headers should be `Pipeline`. This also should apply to build table headers. ## Are there points in the code the reviewer needs to double check? /cc @tauriedavis ## Why was this MR needed? UI consistency ## Screenshots (if relevant) ![Screen_Shot_2016-09-18_at_16.39.16](/uploads/61e64fb3152ac3ec81bec35c5ba0e312/Screen_Shot_2016-09-18_at_16.39.16.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 - [ ] 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? See merge request !6402
\| * \| \| \| \|	Changed `Commit` to `Build` headercorrect-builds-pipeline-commit-header-to-build-header	Luke Bennett	2016-09-18	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-simplify-fetch_members' into 'master'	Rémy Coutable	2016-09-21	3	-32/+108
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify ProjectTeam#fetch_members to satisfy flog ## What does this MR do? - Add specs for ProjectTeam#fetch_members - Simplify ProjectTeam#fetch_members to satisfy flog ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22200 See merge request !6431
\| * \| \| \| \| \|	Simplify invited_group_members filter-by-level	Robert Speicher	2016-09-21	1	-6/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use `public_send` over `send` in ProjectTeam	Robert Speicher	2016-09-21	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve clarity of variable names in ProjectTeam#fetch_invited_membersrs-simplify-fetch_members	Robert Speicher	2016-09-20	1	-14/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix a logic error in ProjectTeam#fetch_invited_members	Robert Speicher	2016-09-20	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were calling `.where` and `.send` on the relation, but never doing anything with the return value, resulting in proper access-level filtering never being of any consequence.
\| * \| \| \| \| \|	Simplify ProjectTeam#fetch_members to satisfy flog	Robert Speicher	2016-09-20	1	-30/+40
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add specs for ProjectTeam#fetch_members	Robert Speicher	2016-09-20	2	-0/+67
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'shrink-profile-info' into 'master'	Fatih Acet	2016-09-21	5	-61/+89
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shrink profile info ## What does this MR do? Updates design of profile page to match comps ## Screenshots (if relevant) ![Screen_Shot_2016-09-16_at_11.34.21_AM](/uploads/5c2f510e6cc64bf466309db8ec02b9e0/Screen_Shot_2016-09-16_at_11.34.21_AM.png) ![Screen_Shot_2016-09-16_at_11.35.20_AM](/uploads/ebd3471965340fce5a897dcfc1a5385c/Screen_Shot_2016-09-16_at_11.35.20_AM.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 - [ ] 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 https://gitlab.com/gitlab-org/gitlab-ce/issues/18071 See merge request !6394
\| * \| \| \| \| \| \|	clean up profileshrink-profile-info	tauriedavis	2016-09-16	3	-56/+82
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	shrink profile info	tauriedavis	2016-09-16	4	-37/+39
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'show-all-pipelines-from-all-diffs' into 'master'	Rémy Coutable	2016-09-21	4	-10/+79
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show all pipelines from all merge_request_diffs This way we could also show pipelines from commits which were discarded due to a force push. Closes #21889 See merge request !6414
\| * \| \| \| \| \| \| \|	Use factory instead of using new directly. Feedback:show-all-pipelines-from-all-diffs	Lin Jen-Shin	2016-09-21	1	-9/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6414#note_15765156
\| * \| \| \| \| \| \| \|	Add a test for non-persisted merge request	Lin Jen-Shin	2016-09-20	1	-0/+22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	If merge request wasn't persisted yet, we show only 1 pipeline:	Lin Jen-Shin	2016-09-20	1	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	However, if MergeRequest#all_commits_sha would want to handle non-persisted merge request, by judging its name, it should not just give 1 SHA, but all of them. But we don't really care all_commits_sha for non-persisted merge request anyway. So I think we should just ignore that case. Better to not implementing something than implementing it in a wrong and confusing way.
\| * \| \| \| \| \| \| \|	Test against MergeRequest#all_commits_sha, feedback:	Lin Jen-Shin	2016-09-20	1	-9/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6414#note_15750344 So that we could just use it in testing for MergeRequest#all_pipelines
\| * \| \| \| \| \| \| \|	slightly tweak about the comment, feedback:	Lin Jen-Shin	2016-09-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6414#note_15750250
\| * \| \| \| \| \| \| \|	Introduce MergeRequest#all_commits_sha, feedback:	Lin Jen-Shin	2016-09-20	1	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6414#note_15746083
\| * \| \| \| \| \| \| \|	Add an entry to CHANGELOG [ci skip]	Lin Jen-Shin	2016-09-20	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show all pipelines from all merge_request_diffs:	Lin Jen-Shin	2016-09-19	3	-9/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This way we could also show pipelines from commits which were discarded due to a force push.
* \| \| \| \| \| \| \| \|	Merge branch 'limit-number-of-shown-environments' into 'master'	Rémy Coutable	2016-09-21	8	-21/+130
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit number of shown environments ## What does this MR do? This MR limits in context of Merge Request a list of shown environments. Previously we would show all environments containing the SHA of the head commit of Merge Request. However, with introducing of dynamically created environments this lead to a cases that we would show multiple review apps, for different branches, because these branches would contain a new questioned commit. This MR changes what environments we test against presence of the commit, to: 1. We look for environments with deployments to source_branch of source_project: used for deployments to per-branch environments, 2. We look for environments with deployments to target_branch of target_project: used for deployments to staging / production environments, 3. We look for environments with deployments for tags on target_project: used for staging / production environments. ## Why was this MR needed? To improve a list of returned environments when we introduced ability to create dynamic environments for review apps: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6323 See merge request !6438
\| * \| \| \| \| \| \| \| \|	Scope environments to projectlimit-number-of-shown-environments	Kamil Trzcinski	2016-09-21	4	-2/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve specs	Kamil Trzcinski	2016-09-21	2	-4/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix project for merge_request environments	Kamil Trzcinski	2016-09-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add tests to verify the correctness of returned environments	Kamil Trzcinski	2016-09-21	6	-11/+93
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Limit number of shown environments for Merge Requests	Kamil Trzcinski	2016-09-21	3	-14/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- For target project show only environments for target branch or with tags - For source project show only environments for source branch
* \| \| \| \| \| \| \| \| \|	Merge branch '20310-new-project-btn' into 'master'	Jacob Schatz	2016-09-21	3	-3/+15
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new project button alignment ## What does this MR do? Increases the width of the button/search container to fit all items at smaller screen width. The left side of the row can only have a max of two tabs (All Projects, Shared Projects), so everything can still fit on one line until they resize for mobile ## Why was this MR needed? The `New project` button wrapped to next line at smaller screen width, breaking the layout ## Screenshots (if relevant) ![Screen_Shot_2016-09-09_at_11.44.27_AM](/uploads/a726208deec6623d9fb62db0a549bf38/Screen_Shot_2016-09-09_at_11.44.27_AM.png) ![Screen_Shot_2016-09-09_at_11.46.29_AM](/uploads/bd8dc911757b14c5fafc4d3849e0b242/Screen_Shot_2016-09-09_at_11.46.29_AM.png) ## What are the relevant issue numbers? Closes #20310 See merge request !6286
\| * \| \| \| \| \| \| \| \|	Fix new project button alignment20310-new-project-btn	Annabel Dunstone Gray	2016-09-14	3	-3/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add 8.11.7, 8.10.10, and 8.9.10 CHANGELOG entries	Rémy Coutable	2016-09-21	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2016-09-21	2	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'vitalybaev/gitlab-ce-build-page-sidebar-coverage-horizontal-padding' See !6196.
\| * \| \| \| \| \| \| \| \|	Added horizontal padding on build page sidebar on code coverage block	Vitaly Baev	2016-09-21	2	-0/+5
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>