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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove unused attributesfix-variable-and-comments	Alfredo Sumaran	2016-09-22	2	-2/+1
\|
*	Merge branch 'rs-sign-up-sign-in' into 'master'	Jacob Schatz	2016-09-22	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Change "Please register or login" to "Please sign up or sign in" See merge request !6443
\| *	Change "Please register or login" to "Please sign up or sign in"rs-sign-up-sign-in	Robert Speicher	2016-09-21	1	-2/+2
\| \| \| \| \| \| \| \|	Now this is more consistent with the rest of the app.
* \|	Update VERSION to 8.13.0-prev8.13.0.pre	Rémy Coutable	2016-09-22	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'revert-6455-and-4960' into 'master'	Douwe Maan	2016-09-22	10	-94/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert the "accurate issuable counts in issuable list" feature ## Why was this MR needed? !6455 introduced a performance killer, so we revert it until we find a proper solution that's not killing performance. ## What are the relevant issue numbers? Revert !6455 and !4960. See merge request !6476
\| * \|	Revert part of "Merge branch 'update_issues_mr_counter' into 'master'	Rémy Coutable	2016-09-22	9	-72/+18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Revert "Merge branch ↵	Rémy Coutable	2016-09-22	2	-26/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22421-fix-issuable-counter-when-more-than-one-label-is-selected' into 'master' " This reverts commit 8ed5be5935a77fffe730baa188d1e1fc1c739d72, reversing changes made to fb0d1378f4f3365a9cae0938829da0560a92b6e6.
* \| \|	Merge branch 'ci-permissions-documentation' into 'master'	Achilleas Pipinellis	2016-09-22	4	-0/+325
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Describe how the recent changes of CI permissions affect builds ## What does this MR do? This describes how the CI permission changes See merge request !6451
\| * \| \|	Copyedit the CI build permissions doc	Achilleas Pipinellis	2016-09-22	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Small fixes in CI build permissions docs	Achilleas Pipinellis	2016-09-22	2	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add link to external user - Move build triggers up
\| * \| \|	s/project/build	Achilleas Pipinellis	2016-09-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Added a note about build triggers [ci skip]	Kamil Trzcinski	2016-09-22	2	-0/+12
\| \| \| \|
\| * \| \|	Make 'build permissions' consistent	Achilleas Pipinellis	2016-09-22	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Add a small description mentioning submodules/LFS	Achilleas Pipinellis	2016-09-22	1	-2/+1
\| \| \| \|
\| * \| \|	Move document on CI build permissions to new location	Achilleas Pipinellis	2016-09-22	3	-16/+16
\| \| \| \|
\| * \| \|	Refactor new CI build permissions model docs	Achilleas Pipinellis	2016-09-22	2	-158/+211
\| \| \| \|
\| * \| \|	Update permissions table	Kamil Trzcinski	2016-09-22	1	-6/+23
\| \| \| \|
\| * \| \|	Describe how the recent changes of CI permissions affect builds	Kamil Trzcinski	2016-09-22	3	-0/+244
\| \|/ /
* \| \|	Merge branch 'fix-mr-version-dropdowns' into 'master'	Fatih Acet	2016-09-22	1	-34/+38
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix dropdowns for mr-versions ## What does this MR do? Change markup of mr version dropdowns to be in line with ui guidelines so that the dropdown content is scrollable. ## Why was this MR needed? Dropdowns were not scrolling. ## 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 cc @brycepj @dzaporozhets See merge request !6460
\| * \| \|	fix dropdowns for mr-versionsfix-mr-version-dropdowns	tauriedavis	2016-09-22	1	-34/+38
\| \| \| \|
* \| \| \|	Merge branch 'search-field-ignores' into 'master'	Rémy Coutable	2016-09-22	2	-17/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Intercept issues search form submit to preserve filters. ## What does this MR do? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/896 by intercepting manual search form submission and redirecting it to use existing logic (now factored out into `executeSearch`). ## Why was this MR needed? Manual form submission (keying in 'enter') in issues search did not preserve applied filters. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/896 See merge request !6054
\| * \| \| \|	Intercept issues search form submit to preserve filters.search-field-ignores	Bryce	2016-09-22	2	-17/+25
\| \| \| \| \|
* \| \| \| \|	Merge branch 'hotfix-gl-dropdown-field-undefined' into 'master'	Rémy Coutable	2016-09-22	1	-12/+13
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes protected branches not removing active item ## What does this MR do? Fixes an problem where protected branches weren't getting their active item removed on a second click because they dont have a field value. ## Why was this MR needed? Protected branches could not have their clicked items removed once clicked. See merge request !6440
\| * \| \| \|	Added checks for field before field.length and removed unneeded fieldNamehotfix-gl-dropdown-field-undefined	Luke Bennett	2016-09-20	1	-12/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch '22417-api-fork-fix' into 'master'	Rémy Coutable	2016-09-22	2	-3/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Return 404 when trying to fork to unaccessible namespace Closes #22417 See merge request !6452
\| * \| \| \|	API: Return 404 when trying to fork to unaccessible namespace	Rémy Coutable	2016-09-22	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fix-pipeline-for-empty-merge-request-diff' into 'master'	Rémy Coutable	2016-09-22	3	-7/+48
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline error when trying to read empty merge request diff When a user pushed something which resulted an empty merge request diff, `st_commits` would be `nil`. Therefore we also need to check if there exists `st_commits`. We could tell this from: ``` ruby def commits @commits \|\|= load_commits(st_commits \|\| []) end ``` and ``` ruby def save_commits new_attributes = {} commits = compare.commits if commits.present? commits = Commit.decorate(commits, merge_request.source_project).reverse new_attributes[:st_commits] = dump_commits(commits) end update_columns_serialized(new_attributes) end ``` Closes #22438 See merge request !6470
\| * \| \| \| \|	Add test for MergeRequestDiff#commits_sha, feedback:	Lin Jen-Shin	2016-09-22	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6470#note_15856755
\| * \| \| \| \|	So that st_commits could never be nil	Lin Jen-Shin	2016-09-22	1	-4/+6
\| \| \| \| \| \|
\| * \| \| \| \|	For empty merge_request_diff st_commits would be nilfix-pipeline-for-empty-merge-request-diff	Lin Jen-Shin	2016-09-22	2	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #22438
* \| \| \| \| \|	Merge branch 'bpj-merge-request-diff-fixes' into 'master'	Rémy Coutable	2016-09-22	3	-9/+6
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixups for Frontend for Merge Request Diff ## What does this MR do? Makes a few revisions to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343, as per feedback from @DouweM. Specifically, it removes a duplicate in the changelog, removes colons in dropdowns, uses icon helper, and fixes the 'Show original' link path. ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343 was already merged and this is a needed patch. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343 See merge request !6448
\| * \| \| \| \|	Stop disabling jump_to_next buttons, when not on latest MR diff.bpj-merge-request-diff-fixes	Bryce Johnson	2016-09-22	1	-3/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove colons in dropdowns, use icon helper, and fix 'Show original' link.	Bryce Johnson	2016-09-22	2	-6/+5
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	(Also removes duplicate changelog entry.)
* \| \| \| \|	Merge branch 'dz-improve-mr-versions-doc' into 'master'	Rémy Coutable	2016-09-22	4	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge request versions documentation with new screenshots For #13570 based on https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 See merge request !6454
\| * \| \| \| \|	Update merge request versions documentation with new screenshotsdz-improve-mr-versions-doc	Dmitriy Zaporozhets	2016-09-21	4	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2016-09-22	2	-9/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22421-fix-issuable-counter-when-more-than-one-label-is-selected' into 'master' Hotfix the issuable counters when filtering by multiple labels This is an ugly fix, but it make the counters work when multiple labels are selected so I think we should include it in 8.12, and try to find a proper fix afterward. Closes #22421 See merge request !6455
\| * \| \| \| \| \|	Hotfix the issuable counters when filtering by multiple labels22421-fix-issuable-counter-when-more-than-one-label-is-selected	Rémy Coutable	2016-09-22	2	-9/+26
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'update-db-schema' into 'master'	Rémy Coutable	2016-09-22	1	-4/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update db/schema.rb per most recent migrations See merge request !6446
\| * \| \| \| \| \|	Update db/schema.rb per most recent migrationsupdate-db-schema	Yorick Peterse	2016-09-21	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It seems this wasn't updated properly when migrations were added in a previous commit.
* \| \| \| \| \| \|	Merge branch 'sh-bump-gitlab-shell-8.12' into 'master'	Achilleas Pipinellis	2016-09-22	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell upgrade version to 3.6.0 for 8.12 [ci skip] Closes #22442 See merge request !6469
\| * \| \| \| \| \|	Bump gitlab-shell upgrade version to 3.6.0 for 8.12sh-bump-gitlab-shell-8.12	Stan Hu	2016-09-22	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'docs/cycle-analytics' into 'master' merge-request-push-compare-ui	Achilleas Pipinellis	2016-09-22	1	-6/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in cycle analytics docs See merge request !6467
\| * \| \| \| \| \|	Fix typos in cycle analytics docs	Achilleas Pipinellis	2016-09-22	1	-6/+8
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'docs/issue-closing-pattern' into 'master'	Achilleas Pipinellis	2016-09-22	8	-44/+114
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change location and refactor issue closing pattern documentation ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [x] Make sure internal links pointing to the document in question are not broken. - [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [x] If working on CE, submit an MR to EE with the changes as well. See merge request !6466
\| * \| \| \| \|	Change location and refactor issue closing pattern documentation	Achilleas Pipinellis	2016-09-22	8	-44/+114
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split into user and administrator docs: - administration/issue_closing_pattern.md - user/project/issues/automatic_issue_closing.md [ci skip]
* \| \| \| \|	Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"	Rubén Dávila Santos	2016-09-22	2	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !6429
* \| \| \| \|	Merge branch 'reorganize_sections_in_admin_settings' into 'master'	Achilleas Pipinellis	2016-09-21	1	-22/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorganize sections in Admin area settings ## What does this MR do? Some settings were under the "wrong" category. This is an attempt to provide proper categories and move relevant settings there. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20126 See merge request !5449
\| * \| \| \| \|	Reorganize sections in Admin area settingsreorganize_sections_in_admin_settings	Achilleas Pipinellis	2016-09-21	1	-22/+32
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create new 'Abuse reports' group - Create new 'Usage statistics' group - Create new 'Email' group
* \| \| \| \|	fix import/export security specs after merge	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