summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| | | | | |
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a rake task that will trigger gitlab:uploads:migrate rake task with different possible arguments, one by one.
* | | | | | Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher2018-09-187-17/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove EE-specific lines from Plan concerns See merge request gitlab-org/gitlab-ce!21448
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance some performance guideline titles See merge request gitlab-org/gitlab-ce!21797
| * | | | | | | Remove redundant word from development doc indexRobert Speicher2018-09-181-2/+2
| | | | | | | |
| * | | | | | | Enhance some performance guideline titlesYorick Peterse2018-09-181-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enhances a few performance guideline titles in the development README, making it easier to understand what topics they cover.
* | | | | | | | Merge branch 'qa-refactor-selector-patterns-browserui-manage-login' into ↵Robert Speicher2018-09-186-39/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [QA] consolidate selector patterns (1_manage/login) See merge request gitlab-org/gitlab-ce!21711
| * | | | | | | | [QA] consolidate selector patterns (1_manage/login)Dan Davison2018-09-186-39/+39
|/ / / / / / / /
* | | | | | | | Merge branch 'relax-danger-emoji-matching' into 'master'Robert Speicher2018-09-181-1/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Emoji detection in commit messages Closes gitlab-org/release/framework#15 See merge request gitlab-org/gitlab-ce!21799
| * | | | | | | | Improve Emoji detection in commit messagesYorick Peterse2018-09-181-1/+28
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes our Danger integration so that it is smarter about detecting GitLab emoji in commit messages. This is done using a two step process: 1. We use the old regular expression to determine if a commit message _might_ include an emoji. 2. If this regular expression matches, we then check for all existing emoji names in the commit message. This might be a wee bit expensive, but because we couple it with the previous step it should be rarely executed. This ensures we don't trigger an error when a commit message includes text such as `:foo:bar:`, which is not a valid Emoji. Fixes https://gitlab.com/gitlab-org/release/framework/issues/15
* | | | | | | | Merge branch '41729-enable-auto-devops-instance-wide-for-everyone' into 'master'Kamil Trzciński2018-09-1811-103/+173
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable Auto DevOps by default for self managed instances of GitLab" Closes #41729 See merge request gitlab-org/gitlab-ce!21157
| * | | | | | | | Resolve "Enable Auto DevOps by default for self managed instances of GitLab"Dylan Griffith2018-09-1811-103/+173
|/ / / / / / / /
* | | | | | | | Merge branch ↵Clement Ho2018-09-1814-266/+385
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50111-improve-design-of-cluster-apps-to-handle-larger-quantity' into 'master' Improve cluster apps installation flow Closes #50111 See merge request gitlab-org/gitlab-ce!21567
| * | | | | | | | Improve cluster apps installation flowMike Greiling2018-09-1814-266/+385
|/ / / / / / / /
* | | | | | | | Merge branch 'improve-tab-helper-documentation-specs' into 'master'Douglas Barbosa Alexandre2018-09-184-42/+120
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve TabHelper to clarify the use of Namespaces for the nav_link See merge request gitlab-org/gitlab-ce!21787
| * | | | | | | | Improve TabHelper to clarify the use of Namespaces for the nav_linkGabriel Mazetto2018-09-184-42/+120
|/ / / / / / / /
* | | | | | | | Merge branch '51546-rails5-milestone-groups' into 'master'Yorick Peterse2018-09-183-2/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use MilestoneFinder for group milestones Closes #51546 See merge request gitlab-org/gitlab-ce!21780
| * | | | | | | | Don't use MilestoneFinder for group milestonesDouglas Barbosa Alexandre2018-09-183-2/+27
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the DashboardGroupMilestone model so that it no longer uses the MilestoneFinder, instead using methods defined on the Milestone model directly.
* | | | | | | | Merge branch 'docs/feature-flags-for-new-features' into 'master'Douwe Maan2018-09-183-20/+195
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the use of and need for using feature flags more frequently See merge request gitlab-org/gitlab-ce!21478
| * | | | | | | | Document the need for feature flagsYorick Peterse2018-09-183-20/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a development guide explaining that we are going to use feature flags more often, why, what the benefits are, and so on. See https://gitlab.com/gitlab-org/gitlab-ce/issues/49619 for more information.