summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert changes on files that are not strictly in /docdocs-fix-setup-grammar-marcel-contributionMarcia Ramos2018-09-203-5/+5
* Revert changes in config (file is not in doc/)Marcia Ramos2018-09-201-2/+2
* Merge branch 'docs-fix-setup-grammar-1-ce' into 'docs-fix-setup-grammar-marce...Marcia Ramos2018-09-1958-79/+79
|\
| * Correct grammar (setup to set-up) in DocsMarcel Amirault2018-09-1958-79/+79
|/
* Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-1911-25/+239
|\
| * Changed isDiscussionApplicableToLine to accept an objectPhil Hughes2018-09-183-16/+28
| * Added specs to isDiscussionApplicableToLinePhil Hughes2018-09-171-10/+35
| * 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
| * Fixed diff store actions specPhil Hughes2018-09-174-1/+140
| * Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-178-20/+44
* | Merge branch 'bvl-remove-unused-regex' into 'master'Lin Jen-Shin2018-09-191-1/+0
|\ \
| * | Remove unused constantbvl-remove-unused-regexBob Van Landuyt2018-09-191-1/+0
* | | Merge branch 'fix-setup-grammar-2-ce' into 'master'Douwe Maan2018-09-1937-158/+158
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * | Add merge-request to changelogDJ Mountney2018-09-121-1/+1
| * | Fix the schema load testDJ Mountney2018-09-122-11/+20
| * | Ensure the schema is loaded with post_migrations includedDJ Mountney2018-09-114-11/+48
* | | 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 viewOswaldo Ferreira2018-09-1916-11/+258
|/ / /
* | | Merge branch 'refactor-main-js' into 'master'Phil Hughes2018-09-1944-143/+130
|\ \ \
| * | | 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 classDmitriy Zaporozhets2018-09-19142-174/+168
* | | | | Merge branch 'mr-conflict-specs-enable' into 'master'Tim Zallmann2018-09-191-14/+4
|\ \ \ \ \
| * | | | | Re-enables merge conflicts resolution specPhil Hughes2018-09-111-14/+4
* | | | | | 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-ymlMayra Cabrera2018-09-172-2/+7
* | | | | | Merge branch '51571-wrapper-rake-task-uploads-migrate-os' into 'master'Douwe Maan2018-09-194-4/+71
|\ \ \ \ \ \
| * | | | | | Use complete link to rake taskBalasankar "Balu" C2018-09-181-1/+1
| * | | | | | Add documentation regarding rake taskBalasankar "Balu" C2018-09-182-3/+41
| * | | | | | Add wrapper rake task to migrate all uploads to OSBalasankar "Balu" C2018-09-182-1/+30
* | | | | | | Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher2018-09-187-17/+38
|\ \ \ \ \ \ \
| * | | | | | | Fix bad conflicts resolutionLin Jen-Shin2018-09-171-2/+2
| * | | | | | | Remove EE-specific code from ProtectedRefAccessSean McGivern2018-09-174-11/+15
| * | | | | | | Remove EE-specific code from MentionableSean McGivern2018-09-173-6/+23
| * | | | | | | Remove EE-specific code from IssuableSean McGivern2018-09-171-2/+2
* | | | | | | | Merge branch 'docs/rephrase-development-headings' into 'master'Robert Speicher2018-09-181-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove redundant word from development doc indexRobert Speicher2018-09-181-2/+2
View Lorry Controller Status