summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'docs-dev-guidelines-milestones' into 'master'Achilleas Pipinellis2018-09-201-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the docs' CD, relating to the milestone the doc is set to vs online docs See merge request gitlab-org/gitlab-ce!21737
| * | | | | | | | Explain the docs' CD, relating to the milestone the doc is set to vs online docsMarcia Ramos2018-09-201-0/+16
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/rs-update-docs' into 'master'Achilleas Pipinellis2018-09-202-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct Gitaly config typo in update guides See merge request gitlab-org/gitlab-ce!21821
| * | | | | | | | Correct Gitaly config typo in update guidesRobert Speicher2018-09-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 9.4 to 9.5 and 9.5 to 10.0 guides missed a closing backtick. This was corrected in the 10.0 to 10.1 guide, from which subsequent guides were written without the error.
* | | | | | | | | Merge branch 'docs/fix-releases-link' into 'master'Achilleas Pipinellis2018-09-201-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to blog posts in docs See merge request gitlab-org/gitlab-ce!21820
| * | | | | | | | Fix link to blog postsEvan Read2018-09-201-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a missing `s`, a link to the blog archive for releases was broken.
* | | | | | | | Merge branch 'sh-delete-tags-outside-transaction' into 'master'Robert Speicher2018-09-196-7/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete container repository tags outside of transaction Closes #51380 See merge request gitlab-org/gitlab-ce!21679
| * | | | | | | Move registry destroy out of project transactionStan Hu2018-09-195-9/+18
| | | | | | | |
| * | | | | | | Delete container repository tags outside of transactionStan Hu2018-09-194-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are many tags in a container repository, deleting them can exceed the default 60 second idle-in-transaction timeout in Sidekiq. We now explicitly delete them in the DestroyService before destroying the model. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51380
* | | | | | | | Merge branch 'fix-rubocop-todo' into 'master'Douglas Barbosa Alexandre2018-09-197-21/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop Style/ZeroLengthPredicate See merge request gitlab-org/gitlab-ce!21793
| * | | | | | | | Fix rubocop Style/ZeroLengthPredicateSemyon Pupkov2018-09-187-21/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'relax-danger-commit-subject-rules' into 'master'Robert Speicher2018-09-191-2/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax the subject line requirements for commits Closes gitlab-org/release/framework#16 See merge request gitlab-org/gitlab-ce!21811
| * | | | | | | | | Relax the subject line requirements for commitsYorick Peterse2018-09-191-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the hard limit of 50 to a soft limit of 50, with the new hard limit being 72 characters. This gives people a bit more space, while still (hopefully) guiding them towards subject lines that are roughly 50 characters long. Fixes https://gitlab.com/gitlab-org/release/framework/issues/16
* | | | | | | | | | Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-1911-25/+239
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652
| * | | | | | | | | | Changed isDiscussionApplicableToLine to accept an objectPhil Hughes2018-09-183-16/+28
| | | | | | | | | | |
| * | | | | | | | | | Added specs to isDiscussionApplicableToLinePhil Hughes2018-09-171-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It now tests for the latest diff check
| * | | | | | | | | | Updated latestDiff logic to only be used to LegacyDiffNotesPhil Hughes2018-09-172-5/+3
| | | | | | | | | | |
| * | | | | | | | | | Updated LegacyDiffNote logicPhil Hughes2018-09-175-11/+30
| | | | | | | | | | |
| * | | | | | | | | | Moved legacy diff note check into util methodPhil Hughes2018-09-173-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Un-commented out expect checks in mutation spec
| * | | | | | | | | | Fixed diff store actions specPhil Hughes2018-09-174-1/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated diff mutations and utils spec to check for legacy notes
| * | | | | | | | | | Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-178-20/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This re-enables legacy diff notes on the merge request diffs This feature was not workig correctly after the Vue refactor LegacyDiffNotes have no `position`, instead they only have a `line_code` As an extra, this also re-enables commenting on legacy diffs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873
* | | | | | | | | | | Merge branch 'bvl-remove-unused-regex' into 'master'Lin Jen-Shin2018-09-191-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused constant See merge request gitlab-org/gitlab-ce!21810
| * | | | | | | | | | | Remove unused constantbvl-remove-unused-regexBob Van Landuyt2018-09-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes an unused constant from the `RubyInterpolationInTranslation`. The constant was used in a first implementation of this class.
* | | | | | | | | | | | Merge branch 'fix-setup-grammar-2-ce' into 'master'Douwe Maan2018-09-1937-158/+158
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar in runner-related specs, views and localisations. See merge request gitlab-org/gitlab-ce!21691
| * | | | | | | | | | | Fix grammar in runner-related specs, views and localisations.Marcel Amirault2018-09-1937-158/+158
|/ / / / / / / / / / /
* | | | | | | | | | | Include post migrations when loading the schemaYorick Peterse2018-09-195-11/+57
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | See merge request gitlab-org/gitlab-ce!21689
| * | | | | | | | | | | Add merge-request to changelogDJ Mountney2018-09-121-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix the schema load testDJ Mountney2018-09-122-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And added changelog
| * | | | | | | | | | | Ensure the schema is loaded with post_migrations includedDJ Mountney2018-09-114-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If doing a schema load, the post_migrations should also be marked as up, even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future migration runs will be broken.
* | | | | | | | | | | | Merge branch 'osw-use-diff-stats-rpc-on-comparison-views' into 'master'Nick Thomas2018-09-1916-11/+258
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standalone diff stats RPC on every comparison view Closes #51477, #20282, and #49399 See merge request gitlab-org/gitlab-ce!21778
| * | | | | | | | | | | | Use standalone diff stats RPC on every comparison viewOswaldo Ferreira2018-09-1916-11/+258
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'refactor-main-js' into 'master'Phil Hughes2018-09-1944-143/+130
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor main.js content See merge request gitlab-org/gitlab-ce!19783
| * | | | | | | | | | | | Move shortcuts classes into behaviors/shortcutsMike Greiling2018-09-1831-33/+33
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move findAndFollowLink to lib/utilsMike Greiling2018-09-185-5/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move GFM autocomplete setup, delete dispatcherMike Greiling2018-09-144-34/+21
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move shortcuts instantiation into behaviorsMike Greiling2018-09-143-32/+37
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move performance_bar setup to dispatcher to main.jsMike Greiling2018-09-142-8/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move search autocomplete from dispatcher to main.jsMike Greiling2018-09-144-13/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move preview_markdown.js to behaviorsMike Greiling2018-09-143-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move initFieldErrors from dispatcher to main.jsMike Greiling2018-09-132-8/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove superfluous importMike Greiling2018-09-131-1/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move svg4everybody into polyfills and reorganizeMike Greiling2018-09-134-12/+21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dz-combine-green-buttons' into 'master'Filipa Lacerda2018-09-19142-174/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unite green buttons under one css class See merge request gitlab-org/gitlab-ce!21795
| * | | | | | | | | | | | Unite green buttons under one css classDmitriy Zaporozhets2018-09-19142-174/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename btn-new, btn-create and btn-save to btn-success Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | Merge branch 'mr-conflict-specs-enable' into 'master'Tim Zallmann2018-09-191-14/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enables merge conflicts resolution spec See merge request gitlab-org/gitlab-ce!21654
| * | | | | | | | | | | | Re-enables merge conflicts resolution specPhil Hughes2018-09-111-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
* | | | | | | | | | | | | Merge branch 'vendor-gitlab-ci-auto-devops-yml' into 'master'Kamil TrzciƄski2018-09-192-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor Auto-DevOps.gitlab-ci from gitlab-ci-yml See merge request gitlab-org/gitlab-ce!21775
| * | | | | | | | | | | | Vendor Auto-DevOps.gitlab-ci from gitlab-ci-ymlMayra Cabrera2018-09-172-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses curl instead of wget on install_dependencies, as wget does not support https through http proxy on alpine:latest
* | | | | | | | | | | | | Merge branch '51571-wrapper-rake-task-uploads-migrate-os' into 'master'Douwe Maan2018-09-194-4/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wrapper rake task to migrate all uploads to OS Closes #51571 See merge request gitlab-org/gitlab-ce!21779
| * | | | | | | | | | | | | Use complete link to rake taskBalasankar "Balu" C2018-09-181-1/+1
| | | | | | | | | | | | | |