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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Sentry logging to API callsadd-sentry-logging-to-api	Stan Hu	2016-08-24	7	-42/+92
\| \| \| \|	Closes #21043
*	Merge branch 'patch-4' into 'master'	Achilleas Pipinellis	2016-08-24	2	-0/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge_requests.md with a simpler way to check out a merge request ## What does this MR do? This MR updates `merge_requests.md` with a simpler way to check out a merge request The previous way was put under the "By modifying `.git/config` for a given repository" section. The disadvantage of the old way is that one has to modify `.git/config` for each repository that one uses. The new way was put under the "By adding a git alias" section. One has to create this git alias once, and then it will work from any repository, without having to modify `.git/config` over and over again. ## Are there points in the code the reviewer needs to double check? One should double check that the link provided by the "Check out branch" button in a MR, i.e. https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/workflow/merge_requests.md#checkout-merge-requests-locally, still works. I think it will, since I didn't modify the "Checkout merge requests locally" section name. ## Why was this MR needed? This MR was needed because the old way of checking out a merge request locally requires to modify `.git/config` in all repositories that one has on a computer, which is a tedious task. The new way just requires adding a simple git alias, once. And the `git mr` command then works for all repositories. ## What are the relevant issue numbers? I haven't created an issue for this. ## Screenshots (if relevant) N/A ## 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) - [ ] API support added (N/A) - Tests - [ ] Added for this feature/bug (N/A) - [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 !5944
\| *	Modify the alias to allow specifying a remote	Ondřej Čertík	2016-08-23	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the alias should be used as: git mr upstream 5 To check out a MR number 5 from the upstream remote, into a `mr-upstream-5` local branch. Also clarify that the `5` in the merge request is the number shown in GitLab.
\| *	Add new lines after backticks and colons	Ondřej Čertík	2016-08-23	1	-0/+4
\| \|
\| *	Update CHANGELOG	Ondřej Čertík	2016-08-22	1	-0/+1
\| \|
\| *	Update merge_requests.md with a simpler way to check out a merge request	Ondřej Čertík	2016-08-22	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous way was put under the "By modifying `.git/config` for a given repository" section. The disadvantage is that one has to modify `.git/config` for each repository that one uses. The new way was put under the "By adding a git alias" section. One has to create this git alias once, and then it will work from any repository, without having to modify `.git/config` over and over again.
* \|	Merge branch 'api-project-hook-wiki-page-events' into 'master'	Robert Speicher	2016-08-24	6	-1/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api project hook wiki page events ## What does this MR do? Updates project hook API for wiki page events. Also updates docs and tests for forgotten hook fields. See merge request !5969
\| * \|	api: expose wiki_page_events project hook field in the API	Ben Boeckel	2016-08-24	6	-1/+12
\| \| \|
\| * \|	docs: document other project webhook fields	Ben Boeckel	2016-08-24	2	-0/+11
\| \| \|
* \| \|	Merge branch '20254-create-mr-for-new-branch' into 'master'	Robert Speicher	2016-08-24	5	-12/+64
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	last_push_event widget considers fork events on the main project Push events on the fork of the current project are considered to be shown besides the push events on the current project. Before we just consider fork events if exists a fork so we miss current project events if the current user has a fork. Closes #20254 See merge request !5978
\| * \| \|	Show "Create Merge Request" widget for push events to fork projects on the ↵	Paco Guzman	2016-08-24	5	-12/+64
\| \|/ / \| \| \| \| \| \| \| \| \|	source project
* \| \|	Merge branch 'issue-created_at-docs' into 'master'	Achilleas Pipinellis	2016-08-24	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue created at docs ## What does this MR do? Clarifies `created_at` for creating issues via the API. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Docs were unclear. ## What are the relevant issue numbers? Closes #18458 and closes #19863. ## 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] 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 !5967
\| * \| \|	docs: fix table alignment	Ben Boeckel	2016-08-24	1	-2/+2
\| \| \| \|
\| * \| \|	docs: update created_at docs for creating issues via API	Ben Boeckel	2016-08-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See also #19863. Fixes #18458.
* \| \| \|	Merge branch 'docs/add-tests-coverage-badge-to-readme' into 'master'	Achilleas Pipinellis	2016-08-24	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests coverage report badge to README ## What does this MR do? This MR adds tests coverage badge to project's README. The job it reads coverage value from is `coverage`, and it is configured in out CI test suite to calculate compound coverage from all test jobs running in parallel. This will pick the latest successful pipeline to get `coverage` job and coverage value. For now, this will report test coverage only for backend test suite (Ruby). See merge request !5925
\| * \| \| \|	Add tests coverage report badge to READMEdocs/add-tests-coverage-badge-to-readme	Grzegorz Bizon	2016-08-20	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-4' into 'master'	Achilleas Pipinellis	2016-08-24	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Ruby version to 2.3 in Requirements According to the [GitLab 8.11 release notes](https://about.gitlab.com/2016/08/22/gitlab-8-11-released/), Ruby 2.3 is now supported and recommended. Update the documentation accordingly. See merge request !5965
\| * \| \| \|	Update Ruby version to 2.3 in README	Sebastiaan Lokhorst	2016-08-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update Ruby version to 2.3 in Requirements	Sebastiaan Lokhorst	2016-08-23	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	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
\| \|/ / / /