summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add a note about omnibus chart and info how to backup with gitlab chartdocs-update-helm-docsAlexander Tanayno2018-11-151-1/+14
* Merge branch 'leipert-master-patch-67614' into 'master'Stan Hu2018-11-151-3/+6
|\
| * Update to new security report syntaxleipert-master-patch-67614Lukas Eipert2018-11-141-3/+6
* | Merge branch 'notes-consistent-key-object-case' into 'master'Filipa Lacerda2018-11-1540-695/+676
|\ \
| * | Made diff & note data consistentPhil Hughes2018-11-1440-695/+676
* | | Merge branch '53882-extra-container-diff-version' into 'master'Fatih Acet2018-11-141-2/+25
|\ \ \ | |_|/ |/| |
| * | Tweak vertical line to line up with system notes and comment avatars53882-extra-container-diff-versionAnnabel Dunstone Gray2018-11-141-1/+1
| * | Add back margin on discussion system notesAnnabel Dunstone Gray2018-11-141-1/+1
| * | Remove box on diff tab system noteAnnabel Dunstone Gray2018-11-141-0/+17
| * | Fix version system noteAnnabel Dunstone Gray2018-11-141-1/+7
* | | Merge branch 'sh-exclude-rails4-builds-from-docs' into 'master'Douglas Barbosa Alexandre2018-11-141-0/+2
|\ \ \
| * | | Exclude qa and docs from Rails 4 buildsStan Hu2018-11-141-0/+2
* | | | Merge branch 'dm-commit-email-select-options' into 'master'Stan Hu2018-11-143-3/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix bug causing not all emails to show up in commit email selectboxDouwe Maan2018-11-143-3/+13
| |/ /
* | | Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-142-4/+24
|\ \ \
| * | | Fix styling of snippet and commit discussion comments53918-snippet-commit-commentsAnnabel Dunstone Gray2018-11-142-4/+24
* | | | Merge branch 'discussion-fixes-2' into 'master'Fatih Acet2018-11-142-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix diff border radiusdiscussion-fixes-2Annabel Dunstone Gray2018-11-141-1/+1
| * | | Fix vertical line alignment in discussionAnnabel Dunstone Gray2018-11-141-1/+1
* | | | Merge branch 'dark-theme-comments' into 'master'Fatih Acet2018-11-141-0/+4
|\ \ \ \
| * | | | Add white background to commit diff commentsAnnabel Dunstone Gray2018-11-141-0/+4
| |/ / /
* | | | Merge branch 'qa-fix-git-protocol-v2-spec' into 'master'Rémy Coutable2018-11-141-2/+2
|\ \ \ \
| * | | | Fix Git protocol v2 e2e testqa-fix-git-protocol-v2-specMark Lapierre2018-11-141-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'master' into 'master'Rémy Coutable2018-11-141-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update proofreader.mdPedro García Rodríguez2018-07-201-0/+1
* | | | Merge branch 'fl-gitlab-ui-cicd' into 'master'Clement Ho2018-11-147-58/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | Removes jquery as a dependencyFilipa Lacerda2018-11-141-4/+3
| * | | Updates pipeline code to use gitlab-uiFilipa Lacerda2018-11-127-55/+26
* | | | Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-142-3/+37
|\ \ \ \
| * | | | Fix collapsed files not fully fully expandingPhil Hughes2018-11-132-3/+37
* | | | | Merge branch '53636-fix-rendering-of-any-user-filter' into 'master'Clement Ho2018-11-143-17/+54
|\ \ \ \ \
| * | | | | Disable updating appearance of filter tokens for special valuesHeinrich Lee Yu2018-11-143-17/+54
|/ / / / /
* | | | | Merge branch 'docs/markup-languages' into 'master'Marcia Ramos2018-11-141-10/+24
|\ \ \ \ \
| * | | | | Add a new markup languages sectiondocs/markup-languagesAchilleas Pipinellis2018-11-091-10/+24
* | | | | | Merge branch 'gt-show-navigation-line-separator-ce' into 'master'Nick Thomas2018-11-142-5/+13
|\ \ \ \ \ \
| * | | | | | Show navigation line separator when instance metrics is disabledGeorge Tsiolis2018-11-132-5/+13
* | | | | | | Merge branch 'winh-frontend-testing-slash-docs' into 'master'Tim Zallmann2018-11-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing slash in frontend testing guidewinh-frontend-testing-slash-docsWinnie Hellmann2018-11-131-1/+1
* | | | | | | | Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-1423-797/+741
|\ \ \ \ \ \ \ \
| * | | | | | | | Minor gem fixesswitch-railsJan Provaznik2018-11-143-5/+5
| * | | | | | | | Add ApplicationRecord model classJan Provaznik2018-11-141-0/+5
| * | | | | | | | Addressed documentation commentsJan Provaznik2018-11-141-9/+21
| * | | | | | | | Address specs failing in rails 4Jan Provaznik2018-11-143-2/+16
| * | | | | | | | Fix trigerring of rails 4 tests in CIJan Provaznik2018-11-141-1/+1
| * | | | | | | | Add missing changelogJan Provaznik2018-11-141-0/+5
| * | | | | | | | Make rails5 defailt in bin/* scriptsJan Provaznik2018-11-143-3/+3
| * | | | | | | | Add rails5 docJan Provaznik2018-11-142-0/+16
| * | | | | | | | Update db/schema.rb according to Rails 5Jan Provaznik2018-11-141-535/+402
| * | | | | | | | Fix index for mysql adapterJan Provaznik2018-11-141-16/+34
| * | | | | | | | Switch rails 4 to 5 in gitlab-ciJan Provaznik2018-11-143-93/+93