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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope	Rémy Coutable	2016-07-01	31	-98/+225
\| \| \| \| \| \|	And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'todos-api' into 'master'	Rémy Coutable	2016-07-01	12	-1/+970
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Todos API * Closes #14068 * Closes #14675 - [x] Implementation - [x] Tests - [x] Documentation - [x] Changelog See merge request !3188
\| *	Support creating a todo on issuables via APItodos-api	Robert Schilling	2016-07-01	4	-2/+268
\| \|
\| *	Expose target, filter by state as string	Robert Schilling	2016-07-01	5	-120/+377
\| \|
\| *	Add todos API documentation and changelog	Robert Schilling	2016-07-01	4	-3/+220
\| \|
\| *	pass paginated array when deleting notes	Robert Schilling	2016-07-01	1	-1/+1
\| \|
\| *	Expose action_name	Robert Schilling	2016-07-01	3	-1/+13
\| \|
\| *	Assert response body	Robert Schilling	2016-07-01	1	-1/+12
\| \|
\| *	Add user to project to see todos	Robert Schilling	2016-07-01	2	-1/+6
\| \|
\| *	Move to helper, no instance variables	Robert Schilling	2016-07-01	3	-17/+10
\| \|
\| *	Make tests follow the guidelines	Robert Schilling	2016-07-01	1	-10/+20
\| \|
\| *	Fix rebase	Robert Schilling	2016-07-01	1	-4/+0
\| \|
\| *	Add Todos API	Douglas Barbosa Alexandre	2016-07-01	7	-1/+203
\| \|
* \|	Merge branch 'fix/import-export-events' into 'master'	Rémy Coutable	2016-07-01	12	-2030/+4070
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing problems with events for import/export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19202 A couple of issues related to target being missing in exported `Events` (as being polymorphic and not have `ActiveRecord` relationships is a bit more tricky than normal models) plus as the export was in JSON, the import retrieves hashed fields as stringified hashes and not symbolized - so fixed that as well, which was the cause of https://gitlab.com/gitlab-org/gitlab-ce/issues/19202 Also fixed / refactored tests :simpl Import/Export Version has been bumped to 0.1.1 as theses changes to events won't work very well with old exports - forcing users to generate a new export in the new version. See merge request !4987
\| * \|	Many squashed commits	James Lopez	2016-07-01	1	-7/+1
\| \| \|
\| * \|	use has_many relationship with events	James Lopez	2016-07-01	7	-19/+13
\| \| \|
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-07-01	460	-740/+1976
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-export-events
\| * \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-06-29	4	-14/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-export-events
\| * \| \| \|	add changelog	James Lopez	2016-06-29	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fix final line missing	James Lopez	2016-06-29	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	updated integration test file	James Lopez	2016-06-29	1	-0/+0
\| \| \| \| \|
\| * \| \| \|	fixes and refactored JSON spec	James Lopez	2016-06-29	2	-2023/+4041
\| \| \| \| \|
\| * \| \| \|	bump version - as old exports wont be compatible	James Lopez	2016-06-29	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fixing events for import/export	James Lopez	2016-06-29	7	-7/+34
\| \| \| \| \|
* \| \| \| \|	Merge branch 'upgrade-sprockets-rails' into 'master'	Robert Speicher	2016-07-01	3	-6/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade sprockets and sprockets rails, remove quiet_assets ## What does this MR do? Upgrade Sprockets from 3.6.0 to 3.6.2. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Upgrade Sprockets Rails from 3.0.4 to 3.1.1. Changelog: https://github.com/rails/sprockets-rails/compare/v3.0.4...v3.1.1 quiet_assets has been seemingly abandoned, and now sprockets-rails has the feature built-in! The config was added in this PR: https://github.com/rails/sprockets-rails/pull/355 Working towards #14286. See merge request !5029
\| * \| \| \| \|	Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-rails	Connor Shea	2016-06-30	3	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quiet_assets has been seemingly abandoned, and now sprockets-rails has the feature built-in! From this PR: https://github.com/rails/sprockets-rails/pull/355
\| * \| \| \| \|	Upgrade Sprockets and Sprockets Rails.	Connor Shea	2016-06-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Sprockets from 3.6.0 to 3.6.2. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Upgrade Sprockets Rails from 3.0.4 to 3.1.1. Changelog: https://github.com/rails/sprockets-rails/compare/v3.0.4...v3.1.1
* \| \| \| \| \|	Merge branch 'refactor-tags-branches-api' into 'master'	Rémy Coutable	2016-07-01	2	-7/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that branch and tag names are given in API ## What does this MR do? It ensures that the tag or branch name is given. @rymai We talked in an earlier MR about this. See merge request !5012
\| * \| \| \| \| \|	Ensure that branch and tag names are given in APIrefactor-tags-branches-api	Robert Schilling	2016-06-30	2	-7/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'cache-autocomplete-results' into 'master'	Jacob Schatz	2016-07-01	2	-2/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache autocomplete results ## What does this MR do? Caches the results of the autocomplete AJAX call to stop new GFM inputs on the page from requesting new data. The cache is then cleared on each new page so that it doesn't stay around per project. See merge request !5043
\| * \| \| \| \| \|	Cache autocomplete resultscache-autocomplete-results	Phil Hughes	2016-07-01	2	-2/+6
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '18310-improve-request-access-button' into 'master'	Rémy Coutable	2016-07-01	12	-29/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the request / withdraw access button ## What does this MR do? It implements the design proposed in #18310. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To close #18310. ## What are the relevant issue numbers? Closes #18310. ## Screenshots ### Group access request #### Request button \| Medium \| Large \| \| ----------- \| ------- \| \| ![request_access_button](/uploads/a1de370dcbb8ac9a63d2df5c68591db7/request_access_button.png) \| ![request_access_button-large](/uploads/0a1c70380268e620a6ca4d3e1661d58c/request_access_button-large.png) \| #### Withdraw request button \| Medium \| Large \| \| ----------- \| ------- \| \| ![withdraw_access_request_button](/uploads/c9df39d04b61566ec143d5e9cc43ada2/withdraw_access_request_button.png) \| ![withdraw_access_request_button-large](/uploads/10fdaa94d72956e06bdb995e65b51472/withdraw_access_request_button-large.png) \| ### Project access request #### Request button \| Medium \| Large \| \| ----------- \| ------- \| \| ![request_access_button](/uploads/8e71395041a5cea996a35df2083bb723/request_access_button.png) \| ![project-request_access_button-large](/uploads/adb2dec0eccec8e5171dc0e26e6b03a6/project-request_access_button-large.png) \| #### Withdraw request button \| Medium \| Large \| \| ----------- \| ------- \| \| ![withdraw_access_request_button](/uploads/12be06f0a2bf9426a5e043f52c4d1dab/withdraw_access_request_button.png) \| ![project-withdraw_access_request_button-large](/uploads/93fda7767ee5f02186c4c954ea346254/project-withdraw_access_request_button-large.png) \| ## Does this MR meet the acceptance criteria? - [x] [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) - Tests - [x] 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 !4860
\| * \| \| \| \| \|	Improve the request / withdraw access button18310-improve-request-access-button	Rémy Coutable	2016-07-01	12	-29/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '18592-syntaxhighlighter-slow' into 'master'	Yorick Peterse	2016-07-01	3	-2/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specific metrics for code on Banzai::Filter::SyntaxHighlightFilter See merge request !5038
\| * \| \| \| \| \|	Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab18592-syntaxhighlighter-slow	Paco Guzman	2016-07-01	3	-2/+11
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'enable-shared-runners-with-admins' into 'master'	Rémy Coutable	2016-07-01	7	-12/+58
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Admin should be able to turn shared runners into specific ones: ## What does this MR do? Make sure admins could turn shared runners into specific runners. ## Are there points in the code the reviewer needs to double check? Is this the desired behaviour? ## Why was this MR needed? Closes #19039 Closes #19272 ![Screen_Shot_2016-06-30_at_9.30.05_PM](/uploads/97eb3b4923fd4e498b1f8ca70b1345c8/Screen_Shot_2016-06-30_at_9.30.05_PM.png) See merge request !4961
\| * \| \| \| \| \|	Update CHANGELOG 8.9.5 for runners related fixes	Lin Jen-Shin	2016-07-01	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-07-01	491	-924/+2470
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enable-shared-runners-with-admins * upstream/master: (120 commits) Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9. Remove additional entries from CHANGELOG Catch permission denied errors and ignore the disk Remove coveralls lines Make GH one-off auth the default again for importing GH projects Import from Github using Personal Access Tokens. Remove hardcoded gitlab-shell version in test env now that the required tag is published Updated breakpoint for sidebar pinning Expire branch/tag git data when needed. Remove unnecessary parens Enable Style/UnneededCapitalW Rubocop cop Expiry date on pinned nav cookie Fix broken spec in git_push_service_spec by stubbing an external issue tracker Handle external issues in IssueReferenceFilter Move Changelog entry for build retry fix to 8.9.4 Add Changelog entry for build sidebar retry link fix Improve method that tells if build is retryable Do not show build retry link when build is active Remove coveralls as its unused Move changelot item "Add sub nav to file page view" to 8.9.4 ...
\| * \| \| \| \| \|	Disable Metrics/CyclomaticComplexity for Ability.allowedenable-shared-runners-with-admins	Lin Jen-Shin	2016-06-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's little point to cut that down.
\| * \| \| \| \| \|	Use warning for locked runners:	Lin Jen-Shin	2016-06-30	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4961#note_12794221
\| * \| \| \| \| \|	Use Ability to check pre-requisite. Change back to 403 because:	Lin Jen-Shin	2016-06-29	2	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we're using `can?` it would look weird to use 409
\| * \| \| \| \| \|	Admins should be able to assign locked runners as well	Lin Jen-Shin	2016-06-28	1	-0/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	They're projects, so we shouldn't show lock icon	Lin Jen-Shin	2016-06-28	1	-3/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow admins to assign locked runners:	Lin Jen-Shin	2016-06-28	4	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And show information about locked status. Help! This looks bad :o
\| * \| \| \| \| \|	Use 409 to indicate that interface might be outdated	Lin Jen-Shin	2016-06-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because invalid actions shouldn't be shown on the page.
\| * \| \| \| \| \|	Rename to assignable runner for shared examples:	Lin Jen-Shin	2016-06-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4961#note_12738607
\| * \| \| \| \| \|	Admin should be able to turn shared runners into specific ones:	Lin Jen-Shin	2016-06-28	2	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The regression was introduced by: https://gitlab.com/gitlab-org/gitlab-ce/commit/1b8f52d9206bdf19c0dde04505c4c0b1cf46cfbe I did that because there's a test specifying that a shared runner cannot be enabled, in the API. So I assume that is the case for non-admin, but admins should be able to do so anyway. Also added a test to make sure this won't regress again. Closes #19039
* \| \| \| \| \| \|	Merge branch 'avoid-instantiate-tree-for-projects-show-readme-view' into ↵	Yorick Peterse	2016-07-01	2	-1/+7
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Avoid instantiation of a Git::Tree See merge request !4997
\| * \| \| \| \| \|	Avoid instantiation of a Git::Treeavoid-instantiate-tree-for-projects-show-readme-view	Paco Guzman	2016-06-29	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only needed when the project view is ‘Files view’
* \| \| \| \| \| \|	Merge branch 'improve-system-info' into 'master'	Stan Hu	2016-07-01	1	-11/+38
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Catch permission denied errors and ignore the disk See merge request !5017