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

	Commit message (Collapse)	Author	Age	Files	Lines
*	changelog madnessfix/import-export-events	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 '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
\| \| * \| \|	Catch permission denied errors and ignore the diskimprove-system-info	Josh Frye	2016-06-30	1	-11/+38
\| \| \| \| \|
\| * \| \| \|	Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.	Robert Speicher	2016-06-30	1	-4/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Merge branch 'as-fix-changelog-entries' into 'master'	Robert Speicher	2016-06-30	1	-3/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicated entries from CHANGELOG [ci skip] See merge request !5028
\| \| * \| \| \|	Remove additional entries from CHANGELOG	Alfredo Sumaran	2016-06-30	1	-3/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'build-reopen-json' into 'master'	Gabriel Mazetto	2016-06-30	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build path sends JSON file path ## What does this MR do? Fixes an issue with browser caching JSON response on build page. Steps to see: - Open build (https://gitlab.com/gitlab-org/gitlab-ce/builds/2030226) - Close tab - Re-open tab You should now see some JSON :disappointed: This MR appends `.json` to the end of the build URL so that the browser can't cache it as the same URL. See merge request !4935
\| \| * \| \| \|	Build path sends JSON file pathbuild-reopen-json	Phil Hughes	2016-06-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'cleanup-forgotten-lines' into 'master'	Robert Speicher	2016-06-30	2	-10/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup forgotten lines The `coveralls` gem was unused and thus removed in 7a2f25a. I've forgotten some lines in that MR See merge request !5025
\| \| * \| \| \| \|	Remove coveralls linescleanup-forgotten-lines	Z.J. van de Weg	2016-06-30	2	-10/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix/build-retry-button-in-view' into 'master'	Robert Speicher	2016-06-30	4	-1/+57
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show build retry link when build is active Closes #19244 See merge request !4967
\| \| * \| \| \| \| \|	Move Changelog entry for build retry fix to 8.9.4fix/build-retry-button-in-view	Grzegorz Bizon	2016-06-30	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add Changelog entry for build sidebar retry link fix	Grzegorz Bizon	2016-06-30	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Improve method that tells if build is retryable	Grzegorz Bizon	2016-06-30	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method now should return false if build is not completed. If build is running then it is not retryable, therefore `Ci::Build#retryable?` returned wrong value. This commit changes this behavior
\| \| * \| \| \| \| \|	Do not show build retry link when build is active	Grzegorz Bizon	2016-06-30	2	-1/+38
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2016-06-30	1	-2/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'18991-update-test-env-gitlab-shell-version-when-v3-1-0-is-published' into 'master' Remove hardcoded gitlab-shell version in test env now that the required tag is published See merge request !5023
\| \| * \| \| \| \| \|	Remove hardcoded gitlab-shell version in test env now that the required tag ↵	Alejandro Rodríguez	2016-06-30	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is published
\| * \| \| \| \| \| \|	Merge branch 'fix-external-issue-rendering' into 'master'	Robert Speicher	2016-06-30	5	-6/+45
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle external issues in IssueReferenceFilter Rendering issue references such as `#1` was broken for projects using an external issues tracker. See gitlab-org/gitlab-ce#19036 See merge request !4988
\| \| * \| \| \| \| \| \|	Fix broken spec in git_push_service_spec by stubbing an external issue trackerfix-external-issue-rendering	Stan Hu	2016-06-30	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Handle external issues in IssueReferenceFilter	Yorick Peterse	2016-06-30	4	-6/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IssueReferenceFilter will end up processing internal issue references when a project uses an external issues tracker while still using internal issue references (in the form of `#\d+`). This commit ensures that these links are rendered as external issue links, regardless of whether the project one currently views uses an internal or external issues tracker. Fixes gitlab-org/gitlab-ce#19036, gitlab-com/performance#16
\| * \| \| \| \| \| \| \|	Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-tokens' ↵	Douwe Maan	2016-06-30	13	-54/+176
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Allow importing from Github using Personal Access Tokens _Originally opened at !4005 by @ericidema._ ------ ## What does this MR do? * Made changes to `Gitlab::GithubImport::Client` so that it can be used with Github Personal Access Tokens without the need for OAuth. * Added UI to collect Personal Access Token from user. * Detect if the user has logged in with GitHub and use OAuth to skip the Personal Access Token form. ## Are there points in the code the reviewer needs to double check? Twin Omnibus MR: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/774 ## What are the relevant issue numbers? Closes #13970. ## Screenshots ### GitHub import is configured ![github_import_configured](/uploads/151e4f0edf3f87bfa03c2d97dda8b3d8/github_import_configured.png) ----- ### GitHub import is not configured ![github_import_not_configured](/uploads/cb129f7e2ffe66cceb28ccd9af480284/github_import_not_configured.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] Added for this feature/bug - [ ] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4938
\| \| * \| \| \| \| \| \|	Make GH one-off auth the default again for importing GH projects	Rémy Coutable	2016-06-30	6	-21/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	Import from Github using Personal Access Tokens.	Eric K Idema	2016-06-30	12	-54/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This stands as an alternative to using OAuth to access a user's Github repositories. This is setup in such a way that it can be used without OAuth configuration. From a UI perspective, the how to import modal has been replaced by a full page, which includes a form for posting a personal access token back to the Import::GithubController. If the user has logged in via GitHub, skip the Personal Access Token and go directly to Github for an access token via OAuth.
\| * \| \| \| \| \| \| \|	Merge branch 'fix-changelog' into 'master'	Rémy Coutable	2016-06-30	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong line in changelog ## What does this MR do? Fix a wrong line in the changelog See merge request !5008
\| \| * \| \| \| \| \| \| \|	Fix wrong line in changelog	Robert Schilling	2016-06-30	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix_restore_warning' into 'master'	Rémy Coutable	2016-06-30	2	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix restore warning message ## What does this MR do? Fix the restore Rake task so it properly outputs the database warning. This is a pretty important warning and it was not even being output. After this fix, the output looks like the screenshot below. ![Screen_Shot_2016-06-28_at_3.53.46_PM](/uploads/d250189d39fcacd0c8ec0aacf9cd930d/Screen_Shot_2016-06-28_at_3.53.46_PM.png) See merge request !4980
\| \| * \| \| \| \| \| \| \|	Fix restore warning message	Drew Blessing	2016-06-28	2	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'sidebar-breakpoint' into 'master'	Jacob Schatz	2016-06-30	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated breakpoint for sidebar pinning ## What does this MR do? Updates the breakpoint for sidebar pinning to 1024px. Think we will have the same issue as before when picking into stable with `$window` not being defined. See merge request !5019
\| \| * \| \| \| \| \| \| \|	Updated breakpoint for sidebar pinning	Phil Hughes	2016-06-30	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '18709-branch-tag-collection-caching' into 'master'	Yorick Peterse	2016-06-30	5	-14/+78
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project dashboard appears to be loading tags on every request See merge request !4996