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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add issue search slash commandzj-issue-search-slash-command	Z.J. van de Weg	2016-11-25	7	-9/+71
\| \| \| \|	One of many requested in: gitlab-org/gitlab-ce#24768
*	Merge branch 'issue_24958' into 'master'	Rémy Coutable	2016-11-25	2	-3/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix bad selection on dropdown menu for tags filter Fixes #24958 See merge request !7750
\| *	Fix bad selection on dropdown menu for tags filter	Luis Alonso Chavez Armendariz	2016-11-25	2	-3/+8
\|/
*	Merge branch 'rephrase-system-notes' into 'master'	Robert Speicher	2016-11-25	23	-124/+169
\|\ \| \| \| \| \| \| \| \|	Rephrase some system notes to be compatible with new system note style See merge request !7692
\| *	Rephrase some system notes to be compatible with new system note stylerephrase-system-notes	Douwe Maan	2016-11-24	23	-124/+169
\| \|
* \|	Merge branch 'fix/invalid-storage-cleanup-affecting-test-suite' into 'master'	Robert Speicher	2016-11-25	2	-10/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make test suite deterministic when storage is involved ## What does this MR do? This MR fixes our RSpec test harness because one test example could affect subsequent examples if objects created with `let` had associated files stored in `tmp/tests`. We store files using CarrierWave, but we also have some custom storage rules for CI builds. Some time ago we introduced MR that purged CarrierWave uploads after each run of entire test suite https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3435, but this is not enough, as we should isolate each test example to be able to rely on deterministic test suite. Not cleaning uploads between each test example run, makes it impossible to know if preconditions are correct before test example starts to run, therefore it makes test examples, that use storage, unreliable. This MR is an attempt to improve that. ## What are the relevant issue numbers? Closes #24808 See merge request !7695
\| * \|	Clear test build storage directory before each examplefix/invalid-storage-cleanup-affecting-test-suite	Grzegorz Bizon	2016-11-23	1	-2/+3
\| \| \|
\| * \|	Remove entire test files directory for test builds	Grzegorz Bizon	2016-11-23	1	-7/+5
\| \| \|
\| * \|	Clear Carrierwave upload after each test example	Grzegorz Bizon	2016-11-23	1	-1/+1
\| \| \|
\| * \|	Clean build storage after each RSpec test example	Grzegorz Bizon	2016-11-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents subsequent test examples to be affected by previous tests that were executed.
* \| \|	Merge branch 'zj-upgrade-grape' into 'master'	Robert Speicher	2016-11-25	7	-19/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update grape-entity to 0.6.0 See merge request !7491
\| * \| \|	Remove tests which do not add valuezj-upgrade-grape	Z.J. van de Weg	2016-11-23	3	-12/+0
\| \| \| \|
\| * \| \|	Upgrade grape-entity to 0.6.0	Z.J. van de Weg	2016-11-23	4	-8/+5
\| \| \| \|
\| * \| \|	Add changelog entry for grape-entity upgrade	Z.J. van de Weg	2016-11-21	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Upgrade grape-entity	Z.J. van de Weg	2016-11-21	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#14329
* \| \| \|	Merge branch '24780-show-last-updated-or-resolved-in-mr-discussion' into ↵	Fatih Acet	2016-11-24	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' resolves updated and resolved status is not showing ## What does this MR do? This MR fixes #24780 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MRs removes some important information as par suggested design in #19797. it restores that information ## Screenshots (if relevant) Before: ![before](/uploads/a93091e783de3e550a07ddbc1fa8085a/before.png) After: ![after](/uploads/ceb7f64a6f20155abcf6ea49d4b8059e/after.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [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 it does - 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 #24780 See merge request !7655
\| * \| \| \|	resloves failed rspec test24780-show-last-updated-or-resolved-in-mr-discussion	Nur Rony	2016-11-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	resolves updated and resolved status is not showin	Nur Rony	2016-11-23	1	-0/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'resolve-discussions-timeago' into 'master'	Fatih Acet	2016-11-24	3	-4/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed resolved discussion timeago not rendering ## What does this MR do? Initialises the timeago element when a discussion is updated or resolved. ## Screenshots (if relevant) ![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png) ## What are the relevant issue numbers? Closes #24787 See merge request !7656
\| * \| \| \|	Fixed timeago when creating new discussionresolve-discussions-timeago	Phil Hughes	2016-11-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed resolved discussion timeago not rendering	Phil Hughes	2016-11-22	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24787
* \| \| \| \|	Merge branch 'fixed-commit-timeago' into 'master'	Fatih Acet	2016-11-24	2	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed commit time not rendering after initial page load ## What does this MR do? Inits the timeago for commits when infinite scrolling which fixes the issue of the timeago not rendering correctly when scrolling down. ## What are the relevant issue numbers? Closes #24862 See merge request !7704
\| * \| \| \| \|	Fixed commit time not rendering after initial page loadfixed-commit-timeago	Phil Hughes	2016-11-23	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24862
* \| \| \| \| \|	Merge branch '23813-fix-username-character-validation-message' into 'master'	Fatih Acet	2016-11-24	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly escape username validation error ## What does this MR do? Prevents the double-escaping of the username validation error when attempting to change one's username using an invalid character. Go to [/profile/account](https://gitlab.com/profile/account) and attempt to add an invalid character like `@` or `#` to your username to trigger this message. ## Screenshots (if relevant) #### Before: ![user-name-change](/uploads/8e509ca8a22e40fd51c3c1919e9c6871/user-name-change.png) #### After: ![Screen_Shot_2016-11-23_at_5.23.52_PM](/uploads/3e868128724e6af07d1193494ec25941/Screen_Shot_2016-11-23_at_5.23.52_PM.png) ## Does this MR meet the acceptance criteria? - [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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) - [x] Branch has no merge conflicts with `master` (if it does - 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? Closes #23813 See merge request !7725
\| * \| \| \| \| \|	properly escape username validation error message flash23813-fix-username-character-validation-message	Mike Greiling	2016-11-23	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue-boards-scrollable-element' into 'master'	Fatih Acet	2016-11-24	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue boards scrolling with a lot of lists & issues ## What does this MR do? When an issue board has a lot of lists & each list has a lot of issues scrolling can be tricky. This changes that by making the element that scrolls the `board-list` div. This is ok because sorting inside each list isn't possible, it will need re-thinking when sorting is possible but this fixes the bug for now. See merge request !7748
\| * \| \| \| \| \| \|	Fixed issue boards scrolling with a lot of lists & issues	Phil Hughes	2016-11-24	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a board has a lot of lists & issues scrolling stops the user from moving the issue to the lsat list (or any list not on screen). This changes that by making the scrollable element the board-list element. This will need re-thinking when sorting in lists is possible.
* \| \| \| \| \| \| \|	Merge branch 'remove-backup-strategies' into 'master'	Stan Hu	2016-11-24	4	-34/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop supporting Google Cloud and Azure as backup strategies ## What does this MR do? It removes support for Azure and Google Cloud as backup strategies (via Fog). Motivation behind this decision can be found in !4928, !6713 but basically they require a lot of gems that are unrelated to the backup use-case. ## Are there points in the code the reviewer needs to double check? Am I missing any other location where we'd use these gems? See merge request !7739
\| * \| \| \| \| \| \| \|	Stop supporting Google and Azure as backup strategiesremove-backup-strategies	Rémy Coutable	2016-11-24	4	-34/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The amount of gems required is quite high compared to the usefulness of the features. Related to !4928, !6713 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'boards-issue-sorting' into 'master'	Fatih Acet	2016-11-24	5	-6/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue boards issue sorting when dragging issue into list ## What does this MR do? Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom. This changes that by adding the issue at the specific index. ## Screenshots (if relevant) ![boards-sorting](/uploads/9aa4a0cb5e0be79e7d24ab2b6abb0bbb/boards-sorting.gif) See merge request !7734
\| * \| \| \| \| \| \| \| \|	Fixed dragging issue moving wrong issue after multiple drags of issueboards-issue-sorting	Phil Hughes	2016-11-24	2	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed issue boards issue sorting when dragging issue into list	Phil Hughes	2016-11-24	4	-5/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom.
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2016-11-24	1	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analytics' into 'master' Pick valid event objects for the events list ## What does this MR do? Fixes JS error when loading events with possible `null` objects ## What are the relevant issue numbers? Closes #24836 See merge request !7689
\| * \| \| \| \| \| \| \| \| \|	Take only objects for the events list24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analytics	Alfredo Sumaran	2016-11-23	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-api-projects-docs' into 'master'	Sean McGivern	2016-11-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can only assign default_branch when editing a project Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7726 See merge request !7741
\| * \| \| \| \| \| \| \| \| \| \|	You can only assign default_branch when editing a project or when creating a ↵	Robert Schilling	2016-11-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	project for a specified user [ci skip] You can only assign default_branch when editing a project [ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '24779-last-deployment-call-on-nil-environment-fix' into 'master'	Kamil Trzciński	2016-11-24	3	-13/+48
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changes environment.last_deployment to a try expression so it does not fail if e… ## What does this MR do? Fixes the call on `environment.last_deployment` to not break when `environment`is not yet set. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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? Closes #24779 See merge request !7671
\| * \| \| \| \| \| \| \| \| \| \| \|	renames some of the specs and adds changelog entry24779-last-deployment-call-on-nil-environment-fix	tiagonbotelho	2016-11-24	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add tests	Kamil Trzcinski	2016-11-23	2	-12/+43
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	changes environment.last_deployment to a try expression so it does not fail ↵	tiagonbotelho	2016-11-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if environment is not yet set
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'api-no-convert' into 'master'	Rémy Coutable	2016-11-24	4	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't convert data which already is the target type With Grape's DSL we already enforce data types. We don't need to explicitly convert to string if there is already one. See merge request !7740
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Don't convert data which already is the target typeapi-no-convert	Robert Schilling	2016-11-24	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-11-24	4	-36/+26
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin spam spinach test to RSpec See merge request !7708
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Move admin spam spinach test to Rspec	Semyon Pupkov	2016-11-23	4	-36/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2016-11-24	1	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24908-install-instructions-seem-to-have-two-database-steps-out-of-order' into 'master' Fix documentation to create the `pg_trm` extension before creating the DB Closes #24908 See merge request !7735
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix documentation to create the `pg_trm` extension before creating the DB24908-install-instructions-seem-to-have-two-database-steps-out-of-order	Rémy Coutable	2016-11-24	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2016-11-24	1	-0/+58
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing documentation. ## What does this MR do? Add documentation to Build events on webhooks See merge request !7717
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing documentation.	PotHix	2016-11-23	1	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build was being triggered but there was no documentation about it, so I'm adding what I was receiving from webhooks when implementing the Rocketchat integration (https://github.com/PotHix/rocketchat-gitlab-hook).
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-project-api-doc' into 'master'	Sean McGivern	2016-11-24	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add default_branch attr to Project API payload in docs. See merge request !7726
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add default_branch attr to Project API payload in docs.update-project-api-doc	Ruben Davila	2016-11-23	1	-0/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|