Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 '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 |
| | | | | | |||||
| * | | | | Fix typos and grammar | Achilleas Pipinellis | 2016-08-22 | 1 | -22/+27 |
| | | | | | |||||
| * | | | | Add note about labels and system notes | Achilleas Pipinellis | 2016-08-22 | 2 | -0/+5 |
| | | | | | |||||
| * | | | | Mention missing labels for corresponding lists | Achilleas Pipinellis | 2016-08-22 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add section on searching through the Backlog list | Achilleas Pipinellis | 2016-08-22 | 2 | -0/+21 |
| | | | | | |||||
| * | | | | Change images to reflect current status, add link to inline docs | Achilleas Pipinellis | 2016-08-22 | 4 | -18/+24 |
| | | | | | |||||
| * | | | | Complete rest of documentation for Issue Boards | Achilleas Pipinellis | 2016-08-22 | 3 | -49/+87 |
| | | | | | |||||
| * | | | | Remove 10 lists limit | Achilleas Pipinellis | 2016-08-22 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Clean up Issue Board doc a bit | Achilleas Pipinellis | 2016-08-22 | 1 | -37/+25 |
| | | | | | |||||
| * | | | | Great refactor of Issue Board docs | Achilleas Pipinellis | 2016-08-22 | 3 | -10/+89 |
| | | | | | |||||
| * | | | | Documentation for Issue Boards | Achilleas Pipinellis | 2016-08-22 | 1 | -0/+45 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'doc-slash-commands-location' into 'master' | Achilleas Pipinellis | 2016-08-22 | 3 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Change slash commands docs location See merge request !5937 | ||||
| * | | | Change location of slash commands in notes widget | Achilleas Pipinellis | 2016-08-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix docs not rendering the pipe symbol | Achilleas Pipinellis | 2016-08-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Change location of slash commands docs | Achilleas Pipinellis | 2016-08-22 | 2 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'metrics-typo' into 'master' | Yorick Peterse | 2016-08-22 | 4 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix typo in gitlab-workhorse header See merge request !5891 | ||||
| * | | | Fix typo in gitlab-workhorse header | Jacob Vosmaer | 2016-08-19 | 4 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'doc-protected-branches-new-behavior' into 'master' | Achilleas Pipinellis | 2016-08-22 | 4 | -35/+46 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Document protected branches new behavior See merge request !5934 | ||||
| * | | | Conform to doc styleguide on new features | Achilleas Pipinellis | 2016-08-22 | 1 | -2/+2 |
| | | | |