summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* User persisted?ignore-environment-validation-failureShinya Maeda2018-11-151-1/+1
|
* Add changelogShinya Maeda2018-11-152-1/+5
|
* Ignore environment validation failureShinya Maeda2018-11-153-0/+74
|
* Merge branch 'sh-exclude-rails4-builds-from-docs' into 'master'Douglas Barbosa Alexandre2018-11-141-0/+2
|\ | | | | | | | | | | | | Exclude qa and docs from Rails 4 builds Closes #54059 See merge request gitlab-org/gitlab-ce!23091
| * Exclude qa and docs from Rails 4 buildsStan Hu2018-11-141-0/+2
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
* | 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 selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
| * | Fix bug causing not all emails to show up in commit email selectboxDouwe Maan2018-11-143-3/+13
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54045
* | Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-142-4/+24
|\ \ | | | | | | | | | | | | | | | | | | Fix styling of snippet and commit discussion comments Closes #53918 See merge request gitlab-org/gitlab-ce!23035
| * | 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 vertical line alignment in discussion & diff border-radius Closes #53975 See merge request gitlab-org/gitlab-ce!23075
| * | 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 comments See merge request gitlab-org/gitlab-ce!23078
| * | | 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 test Closes gitlab-org/quality/staging#16 See merge request gitlab-org/gitlab-ce!23067
| * | | Fix Git protocol v2 e2e testqa-fix-git-protocol-v2-specMark Lapierre2018-11-141-2/+2
| | | | | | | | | | | | | | | | Remove references to `Factory`
* | | | Merge branch 'master' into 'master'Rémy Coutable2018-11-141-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Update proofreader.md See merge request gitlab-org/gitlab-ce!20752
| * | | 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
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Updates pipeline code to use gitlab-ui See merge request gitlab-org/gitlab-ce!22999
| * | | Removes jquery as a dependencyFilipa Lacerda2018-11-141-4/+3
| | | |
| * | | Updates pipeline code to use gitlab-uiFilipa Lacerda2018-11-127-55/+26
| | | | | | | | | | | | | | | | | | | | Uses gltooltipDirective Removes whitespace
* | | | Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-142-3/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix collapsed files not fully fully expanding Closes #53866 See merge request gitlab-org/gitlab-ce!23019
| * | | | Fix collapsed files not fully fully expandingPhil Hughes2018-11-132-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes files that are collapsed by default not expanding when the expand all button is clicked. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53866
* | | | | 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 values Closes #53636 See merge request gitlab-org/gitlab-ce!22865
| * | | | | 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 section See merge request gitlab-org/gitlab-ce!22921
| * | | | | 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 disabled See merge request gitlab-org/gitlab-ce!22940
| * | | | | | 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 guide See merge request gitlab-org/gitlab-ce!23027
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to Rails 5 Closes #14286 and #48991 See merge request gitlab-org/gitlab-ce!21492
| * | | | | | | | Minor gem fixesswitch-railsJan Provaznik2018-11-143-5/+5
| | | | | | | | |
| * | | | | | | | Add ApplicationRecord model classJan Provaznik2018-11-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5 all models by default inherit from ApplicationRecord.
| * | | | | | | | Addressed documentation commentsJan Provaznik2018-11-141-9/+21
| | | | | | | | |
| * | | | | | | | Address specs failing in rails 4Jan Provaznik2018-11-143-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to run CI with rails 4 for a short-term (until we are sure that we will ship with rails 5). The problem is that rails 4 can not handle rails 5 schema.rb properly - specifically `t.index` directive can not handle multiple indexes on the same column. Because combination of rails 4 + rails 5 schema will be used only in CI for a short-term, we can just ignore these incompatibility failures. This patch adds `rails5` helper for specs.
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add_index replaced with t.index * intiger(size 8) replaced with bigint
| * | | | | | | | Fix index for mysql adapterJan Provaznik2018-11-141-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * similar to rails 5 it assures that index length is set for blob columns also in rails 4 * it also ignores multiple definitions of indexes for mysql, for some tables we define multiple indexes on the same set of columns, but with different parameters (opclasses, where), these are not supported by mysql adapter so the second definition of index is skipped
| * | | | | | | | Switch rails 4 to 5 in gitlab-ciJan Provaznik2018-11-143-93/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI jobs will be triggered both with rails 4 and 5 to make sure we keep backward compatibility if it turns out we have to switch back to rails 4. Rails 4 jobs are not allowed to fail for now, these jobs will be removed in a follow-up MR next cycle.
| * | | | | | | | Switch to Rails 5 by defaultJan Provaznik2018-11-148-146/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * updates Gemfile * uses Rails 5 unless explicitly disabled
* | | | | | | | | Merge branch 'move-assets-compile-sooner' into 'master'Marin Jankovski2018-11-141-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move cloud-native-image to the post-test stage Closes charts/gitlab#897 See merge request gitlab-org/gitlab-ce!22942
| * | | | | | | | | Removing extra option for gitlab:assets:compilemove-assets-compile-soonerIan Baum2018-11-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't need to specify stage as it is inherited from the job template
| * | | | | | | | | Move cloud-native-image job to the post-test stageIan Baum2018-11-131-1/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The job depends on asset image created as part of the gitlab:assets:compile job. https://gitlab.com/charts/gitlab/issues/897
* | | | | | | | | Merge branch 'sh-bump-workhorse-7-1-1' into 'master'Nick Thomas2018-11-141-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump GitLab Workhorse to 7.1.1 See merge request gitlab-org/gitlab-ce!23053
| * | | | | | | | | Bump GitLab Workhorse to 7.1.1Stan Hu2018-11-141-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | This version now supports redis[s]:// URL schemes.
* | | | | | | | | Merge branch 'bump-binding_of_caller-gem-to-0-8-0' into 'master'Stan Hu2018-11-143-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump `binding_of_caller` gem version to 0.8.0 See merge request gitlab-org/gitlab-ce!23040
View Lorry Controller Status