summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | Merge branch '46733-move-filter-dropdown-from-font-awesome-to-our-own-icons' ↵Phil Hughes2018-09-187-12/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Move filter dropdown from Font Awesome to our own icons" Closes #46733 See merge request gitlab-org/gitlab-ce!21694
| * | | | | | Resolve "Move filter dropdown from Font Awesome to our own icons"Constance Okoghenun2018-09-187-12/+18
|/ / / / / /
* | | | | | Merge branch '51564-fix-commit-email-usage' into 'master'Douwe Maan2018-09-189-15/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect the user commit email in more places Closes #51564 See merge request gitlab-org/gitlab-ce!21773
| * | | | | | Guard against regressions in commit email specsNick Thomas2018-09-185-5/+12
| | | | | | |
| * | | | | | Add changelogNick Thomas2018-09-181-0/+5
| | | | | | |
| * | | | | | Remove Gitlab::Git::Repository#user_to_committerNick Thomas2018-09-171-4/+0
| | | | | | |
| * | | | | | Use commit email for wiki actionsNick Thomas2018-09-172-4/+24
| | | | | | |
| * | | | | | Use the correct email address when committing via a file serviceNick Thomas2018-09-175-3/+42
| | | | | | |
* | | | | | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-09-181-5/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update database requirements documentation with more MySQL limitations See merge request gitlab-org/gitlab-ce!21686
| * | | | | | | Update database requirements documentation with more MySQL limitationsMichael Kozono2018-09-181-5/+7
|/ / / / / / /
* | | | | | | Merge branch 'rs-have_link-arguments' into 'master'Douwe Maan2018-09-182-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct usage of the have_link matcher See merge request gitlab-org/gitlab-ce!21755
| * | | | | | | Correct usage of the have_link matcherRobert Speicher2018-09-142-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second option to this matcher should be an options hash; anything else is just ignored, which can lead to false positives in tests. We see one such false positive in the "Learn more" link test in `spec/features/projects/blobs/blob_show_spec.rb`.
* | | | | | | | Merge branch ↵Douwe Maan2018-09-186-4/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master' Resolve "Open issues from archived project listed in group issue board" Closes #45754 See merge request gitlab-org/gitlab-ce!21721
| * | | | | | | | Filter out archived projects from issue/mr countBrett Walker2018-09-174-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the 'non_archived' flag to finder methods
| * | | | | | | | Filter out archived issues from group issue boardBrett Walker2018-09-142-2/+15
| | | | | | | | |
* | | | | | | | | Merge branch 'update-contribution-guideline' into 'master'Douwe Maan2018-09-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve character encodings in CONTRIBUTING See merge request gitlab-org/gitlab-ce!21781
| * | | | | | | | | Resolve character encodings in CONTRIBUTINGAndreas Kämmerle2018-09-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '51273-expose-runners-for-build-in-job-api' into 'master'Kamil Trzciński2018-09-187-7/+88
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose runners status information in job api Closes #51273 See merge request gitlab-org/gitlab-ce!21618
| * | | | | | | | | | Expose runners status information in job apiSteve Azzopardi2018-09-187-7/+88
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-fix-commit-email-migration' into 'master'Nick Thomas2018-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a default commit email if migration has not completed Closes #51530 See merge request gitlab-org/gitlab-ce!21790
View Lorry Controller Status