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

	Commit message (Collapse)	Author	Age	Files	Lines
*	last_push_event widget considers fork events on the main project20254-create-mr-for-new-branch	Paco Guzman	2016-08-24	5	-12/+64
\|
*	Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master'	Douwe Maan	2016-08-23	3	-7/+59
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable commenting on unrelatable diff line ## What does this MR do? Fixes a bug where users can comment on diff lines that can't be commented on and attached to. This is the case for unfolded lines and lines that appear as snippets in the discussion tab. !5864 should be merged before this MR. ## Are there points in the code the reviewer needs to double check? :confused: ## Why was this MR needed? Comments were getting lost on the discussion feed, unable to find their related diff. ## What are the relevant issue numbers? Closes #20633. ## Screenshots (if relevant) ![diffs-comment-fix](/uploads/f902b687fda75492e38397f9705283e0/diffs-comment-fix.mp4) ## 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 [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) See merge request !5681
\| *	Added CHANGELOGdisable-commenting-on-unrelatable-diff-line	Luke Bennett	2016-08-23	1	-0/+1
\| \|
\| *	Added unfold test to parallel and added 'diff discussion' context	Luke Bennett	2016-08-23	2	-3/+34
\| \|
\| *	Better first match on this MR also	Luke Bennett	2016-08-23	1	-1/+1
\| \|
\| *	Updated to optimized specs from !5864	Luke Bennett	2016-08-23	1	-138/+0
\| \|
\| *	Added 'with an unfolded line should not allow commenting' scenario (line 125)	Luke Bennett	2016-08-23	1	-0/+153
\| \|
\| *	Added addtional 'renderable' validator to check 'data-note-type' attr exists	Luke Bennett	2016-08-23	1	-5/+10
\| \|
* \|	Merge branch 'fix-file-links-on-project-page' into 'master'	Douwe Maan	2016-08-23	3	-3/+40
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix file links on project page Files view ## What does this MR do? Fix the project show page when the default view is set to Files so that the links work. ## Are there points in the code the reviewer needs to double check? I can't figure out what caused this to break :confused: ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-com/support-forum/issues/959. ## 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) (N/A) - [x] API support added (N/A) - Tests - [x] Added for this feature/bug - [ ] 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 !5933
\| * \|	Fix file links on project page Files viewfix-file-links-on-project-page	Sean McGivern	2016-08-23	3	-3/+41
\| \| \|
* \| \|	Merge branch 'fix-spinach-branches-spec' into 'master'	Robert Speicher	2016-08-23	2	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Spinach branches spec I broke master by adding a branch to gitlab-test for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5961, which put the branch in this scenario off the first page :laughing: See merge request !5964
\| * \| \|	Fix Spinach branches specfix-spinach-branches-spec	Sean McGivern	2016-08-23	2	-0/+6
\| \| \| \|
* \| \| \|	Merge branch 'fix-spam-submit-button' into 'master'	Robert Speicher	2016-08-23	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also check if Akismet is enabled, before showing the `Submit as spam` button. Fixes #21229 See merge request !5948
\| * \| \| \|	Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-button	Patricio Cano	2016-08-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-impersonation-log' into 'master'	Robert Speicher	2016-08-23	2	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect "stopped impersonation" log message Minor bug: Usernames were swapped in the log message. Closes #21015 See merge request !5949
\| * \| \| \| \|	Fix incorrect "stopped impersonation" log messagefix-impersonation-log	Stan Hu	2016-08-23	2	-1/+3
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #21015
* \| \| \| \|	Merge branch '21107-mr-pipeline-404' into 'master'	Robert Speicher	2016-08-23	1	-11/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project namespace links #### What does this MR do? Fixes pipeline links #### Why was this MR needed? Links went to a 404 on fork MR pipelines tab #### What are the relevant issue numbers? Closes #21107 See merge request !5912
\| * \| \| \| \|	Fix project namespace links21107-mr-pipeline-404	Annabel Dunstone	2016-08-20	1	-11/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'environment-entity-inherit' into 'master'	Douwe Maan	2016-08-23	1	-4/+3
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	entities: make Environment inherit EnvironmentBasic ## What does this MR do? Makes the `Environment` entity inherit from `EnvironmentBasic` ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Just a code simplification. ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - 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 !5959
\| * \| \| \| \|	entities: make Environment inherit EnvironmentBasic	Ben Boeckel	2016-08-23	1	-4/+3
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'change-merge-error-to-text' into 'master'	Yorick Peterse	2016-08-23	3	-2/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change merge_error column from string to text type See merge request !5950
\| * \| \| \| \|	Change merge_error column from string to text type	Stan Hu	2016-08-23	3	-2/+14
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In some cases, the artificial 255-character limit would cause an error in MergeWorker. Closes #20593
* \| \| \| \|	Merge branch 'fix-typo-in-gitlab-flow' into 'master'	Achilleas Pipinellis	2016-08-23	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in gitlab_flow.md ## What does this MR do? Cross MR from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/674 See merge request !5960
\| * \| \| \|	Fix typo in gitlab_flow.mdfix-typo-in-gitlab-flow	Nick	2016-08-23	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'gl-dropdown-enter' into 'master'	Jacob Schatz	2016-08-23	2	-9/+32
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed enter key in search input not working ## What does this MR do? Fixes a bug where the enter key wouldn't search in the top nav search input Closes #20627 See merge request !5888
\| * \| \|	Allow passing an index to selectRowAtIndex	Alfredo Sumaran	2016-08-23	1	-2/+7
\| \| \| \|
\| * \| \|	Fixed enter key in search input not working	Phil Hughes	2016-08-23	2	-10/+28
\|/ / / \| \| \| \| \| \| \| \| \|	Closes #20627
* \| \|	8.11 is released, long live 8.12	Robert Schilling	2016-08-23	2	-2/+2
\|/ /
* \|	Merge branch 'rs-description-templates-tabindex' into 'master'	Robert Speicher	2016-08-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove tab stop from issuable form added by description templates See merge request !5929
\| * \|	Remove tab stop from issuable form added by description templatesrs-description-templates-tabindex	Robert Speicher	2016-08-21	1	-1/+1
\| \| \|
* \| \|	Merge branch 'revert_revert_issuable_lock' into 'master'	Douwe Maan	2016-08-23	11	-18/+141
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert the revert of Optimistic Locking ## What does this MR do? It reverts the revert of optimistic lock https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5146 (and revert MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5245) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19871 Actually the code is already reviewed, except: * Monkey patch `config/initializers/ar_monkey_patch.rb` * We removed default values from migration `db/migrate/20160707104333_add_lock_to_issuables.rb` See merge request !5623
\| * \| \|	Revert the revert of Optimistic Lockingrevert_revert_issuable_lock	Valery Sizov	2016-08-22	11	-18/+141
\| \|/ /
* \| \|	Merge branch 'change-markdown-help-location' into 'master'	Robert Speicher	2016-08-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix location of markdown help Resolves #21208, and incorrect link to the markdown style guide See merge request !5945
\| * \| \|	fix location of markdown help locationchange-markdown-help-location	John Northrup	2016-08-22	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'tests-for-diff-notes' into 'master'	Stan Hu	2016-08-22	1	-0/+161
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests for diff notes (without failures :pray:) ## What does this MR do? Adds specs for diff notes. ## Are there points in the code the reviewer needs to double check? We need to ensure that this doesn't break master again. ## Why was this MR needed? ## What are the relevant issue numbers? Closes #20957 ## Screenshots (if relevant) ## 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 [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) See merge request !5864
\| * \| \| \|	Fixed timing issue with selecting parallel or inline view typestests-for-diff-notes	Luke Bennett	2016-08-22	1	-5/+3
\| \| \| \| \|
\| * \| \| \|	Replaced all `first` with `match:` equivalents	Luke Bennett	2016-08-21	1	-0/+163
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fix-update-ruby-doc' into 'master'	Robert Speicher	2016-08-22	1	-4/+4
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for update 8.10-to-8.11.md doc. ## What does this MR do? Fixed a typo in the docs to update Ruby. See merge request !5941
\| * \| \|	Fix for update 8.10-to-8.11.md doc.	Rubén Dávila Santos	2016-08-22	1	-4/+4
\|/ / /
* \| \|	Merge branch 'fix/coverage-report-merge-time' into 'master'	Robert Speicher	2016-08-22	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump SimpleCov merge timeout to 365 days ## What does this MR do? In case that CI pipeline fails because of intermittent errors in one of the jobs, when someone retries the only failing job located in the middle stage, the job that calculates compound coverage that is configured in later stage, and triggered after retrying job in the pipeline, will still return an accurate coverage value. Closes #21144 See merge request !5932
\| * \| \|	Bump SimpleCov merge timeout to 365 daysfix/coverage-report-merge-time	Grzegorz Bizon	2016-08-22	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'cs-upgrade-ruby-docs' into 'master'	Robert Speicher	2016-08-22	1	-7/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Ruby 2.3 upgrade notes. The 8.10 to 8.11 docs didn't mention Ruby 2.3, now they do. See merge request !5940
\| * \| \| \|	Appease the linter.	Connor Shea	2016-08-22	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Add Ruby 2.3 upgrade notes.	Connor Shea	2016-08-22	1	-7/+31
\|/ / / /
* \| \| \|	Merge branch 'docs-koding-change-loc' into 'master'	Achilleas Pipinellis	2016-08-22	20	-50/+58
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split Koding admin/user docs Backend/Frontend MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909 See merge request !5938
\| * \| \| \|	Remove documentation rendering from /koding for nowdocs-koding-change-loc	Achilleas Pipinellis	2016-08-22	1	-3/+0
\| \| \| \| \|
\| * \| \| \|	Split Koding admin/user docs	Achilleas Pipinellis	2016-08-22	19	-47/+58
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue-boards-doc' into 'master'	Achilleas Pipinellis	2016-08-22	8	-1/+193
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for Issue Boards ## What does this MR do? Add documentation for issue boards. ## What are the relevant issue numbers? - Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/17907 - Backend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5548 - Frontend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5554 See merge request !5713
\| * \| \| \| \|	Remove link to docs from new list textissue-boards-doc	Achilleas Pipinellis	2016-08-22	1	-3/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Add links to landing page and youtube video	Achilleas Pipinellis	2016-08-22	1	-0/+7
\| \| \| \| \| \|