| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojione | Eric Eastwood | 2017-11-15 | 4 | -4/+7 |
| | | |||||
| * | Add basic emoji development docs | Eric Eastwood | 2017-11-15 | 3 | -0/+34 |
| | | |||||
| * | Add rainbow_flag to emoji support map | Eric Eastwood | 2017-11-15 | 4 | -13/+62 |
| | | | | | | | | | | | | | | | | | Tested on the following platforms that split the emoji into separate characters currently. - Windows 10 FCU - Chrome 62.0.3202.89 - Firefox 57.0b14 - MS Edge 41.16299.15.0 - macOS 10.12.6 - Chrome 63.0.3239.40 - Safari 11.0.1 (12604.3.5.1.1) - Firefox 57.0 - Ubuntu 16.04 - Chromium 62.0.3202.75 - Firefox 56.0 | ||||
| * | Regenerate emoji digests with latest gemojione | Eric Eastwood | 2017-11-14 | 14 | -1050/+1111 |
| | | |||||
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Felipe Artur | 2017-11-14 | 0 | -0/+0 |
| |\ | |||||
| * \ | Merge branch dev/master into master | Felipe Artur | 2017-11-14 | 0 | -0/+0 |
| |\ \ | |/ |/| | |||||
| | * | Prevent error when authorizing an admin-created OAauth application without a ↵ | Douwe Maan | 2017-11-13 | 2 | -5/+14 |
| | | | | | | | | | set owner | ||||
| | * | Move update_project_counter_caches? out of issue and merge request | George Andrinopoulos | 2017-11-13 | 7 | -39/+14 |
| | | | |||||
| | * | Add externalized strings | George Andrinopoulos | 2017-11-13 | 2 | -4/+4 |
| | | | |||||
| | * | Add feature test to milestone | George Andrinopoulos | 2017-11-13 | 2 | -0/+35 |
| | | | |||||
| | * | Move total time spend calculation to milestoneish | George Andrinopoulos | 2017-11-13 | 7 | -77/+24 |
| | | | |||||
| | * | Fix static code analysis offence | George Andrinopoulos | 2017-11-13 | 1 | -1/+1 |
| | | | |||||
| | * | Fix collapsed sidebar messages and icon | George Andrinopoulos | 2017-11-13 | 5 | -6/+18 |
| | | | |||||
| | * | Add total time spent to milestones | George Andrinopoulos | 2017-11-13 | 5 | -0/+82 |
| | | | |||||
| * | | Merge branch 'bvl-subgroup-in-dropdowns' into 'master' | Sean McGivern | 2017-11-14 | 8 | -11/+161 |
| |\ \ | | | | | | | | | | | | | | | | | | | Include child projects a user can manage in namespace dropdowns Closes #39987 See merge request gitlab-org/gitlab-ce!15294 | ||||
| | * | | Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdowns | Bob Van Landuyt | 2017-11-14 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | So the groups with the same parent are listed together. The recursive cte seemed to do it by itself, but it is not guaranteed. By ordering on the `route.path` that includes every parent group, we can assume they're going to be in the right order. | ||||
| | * | | Include child projects a user can manage in namespace dropdowns | Bob Van Landuyt | 2017-11-14 | 8 | -10/+157 |
| | | | | | | | | | | | | | These dropdown options are used for creating and transfering projects. | ||||
| * | | | Merge branch 'update-metrics-for-k8s-1.7' into 'master' | Tim Zallmann | 2017-11-14 | 2 | -8/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | Update queries to remove duplicate entries (CE version) See merge request gitlab-org/gitlab-ce!15254 | ||||
| | * | | | Uodate docsupdate-metrics-for-k8s-1.7 | Joshua Lambert | 2017-11-12 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Change label to be more consistent, not a series. | Joshua Lambert | 2017-11-12 | 1 | -4/+2 |
| | | | | | |||||
| | * | | | Fix CPU metric | Joshua Lambert | 2017-11-12 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fix to use variable | Joshua Lambert | 2017-11-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Adjust metrics to ignore Job tag to support k8s 1.7+ | Joshua Lambert | 2017-11-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'fix-typo' into 'master' | Annabel Dunstone Gray | 2017-11-14 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!15358 | ||||
| | * | | | | Fix typofix-typo | Clement Ho | 2017-11-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch '32098-pipelines-navigation' into 'master'38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings | Phil Hughes | 2017-11-14 | 12 | -252/+385 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Stops page reload when changing tabs or pages - uses API requests instead See merge request gitlab-org/gitlab-ce!15280 | ||||
| | * | | | | | Stops page reload when changing tabs or pages - uses API requests instead | Filipa Lacerda | 2017-11-14 | 12 | -252/+385 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master' | Clement Ho | 2017-11-14 | 6 | -10/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Enable UnnecessaryMantissa in scss-lint See merge request gitlab-org/gitlab-ce!15255 | ||||
| | * | | | | | Enable UnnecessaryMantissa in scss-lint | Takuya Noguchi | 2017-11-09 | 6 | -10/+15 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master' | Yorick Peterse | 2017-11-14 | 3 | -2/+24 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to create fork network memberships for forks of forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366 | ||||
| | * | | | | | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-source | Bob Van Landuyt | 2017-11-14 | 3 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the root project of a Fork-of-fork is deleted, the ForkNetwork and the membership for that fork network is never created. In this case we shouldn't try to create the membership, since the parent membership will never be created. This means that these fork networks will be lost. | ||||
| * | | | | | | Merge branch 'issue_40058' into 'master' | Sean McGivern | 2017-11-14 | 3 | -1/+13 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357 | ||||
| | * | | | | | | Prevents position update for image diff notesissue_40058 | Felipe Artur | 2017-11-13 | 3 | -1/+13 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'fix-filter-by-my-reaction' into 'master' | Sean McGivern | 2017-11-14 | 3 | -1/+60 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filter by my reaction is not working Closes #39930 See merge request gitlab-org/gitlab-ce!15345 | ||||
| | * | | | | | | | Fix filter by my reaction is not working | Hiroyuki Sato | 2017-11-13 | 3 | -1/+60 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master' | Kamil Trzciński | 2017-11-14 | 14 | -7/+172 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216 | ||||
| | * | | | | | | | | Reduce changesfix/sm/31771-do-not-allow-jobs-to-be-erased-new | Shinya Maeda | 2017-11-07 | 2 | -30/+25 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Improve spec | Shinya Maeda | 2017-11-07 | 3 | -29/+71 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new | Shinya Maeda | 2017-11-07 | 389 | -4435/+11572 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add doc. Fix spec. Add erase_build in protected_ref rule | Shinya Maeda | 2017-11-07 | 11 | -22/+71 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add change log | Shinya Maeda | 2017-11-06 | 1 | -0/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fix spec. Revert update check. | Shinya Maeda | 2017-11-06 | 4 | -6/+24 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Do not allow jobs to be erased | Shinya Maeda | 2017-11-06 | 8 | -4/+60 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into ↵ | Kamil Trzciński | 2017-11-14 | 3 | -2/+32 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Make sure all pipelines would go to pending once Closes #39884 See merge request gitlab-org/gitlab-ce!15251 | ||||
| | * | | | | | | | | | | Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-action | Lin Jen-Shin | 2017-11-09 | 3 | -2/+32 |
| | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, pipeline could go from skipped to running directly, bypassing the transition for: [:created, :pending] => :running And this is responsible for setting up started_at. Without this fix, started_at would never be set. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39884 | ||||
| * | | | | | | | | | | Merge branch '40092-fix-cluster-size' into 'master' | Tim Zallmann | 2017-11-14 | 4 | -2/+65 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats bytes to human readable number in registry table See merge request gitlab-org/gitlab-ce!15359 | ||||
| | * | | | | | | | | | | Formats bytes to human reabale number in registry table40092-fix-cluster-size | Filipa Lacerda | 2017-11-13 | 4 | -2/+65 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'slack_landing_page-ce-backport' into 'master' | Jacob Schatz | 2017-11-14 | 5 | -0/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slack landing page ce backport See merge request gitlab-org/gitlab-ce!15354 | ||||
| | * | | | | | | | | | | | backport popup varsslack_landing_page-ce-backport | Luke "Jared" Bennett | 2017-11-13 | 1 | -0/+7 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | url_utility and style backport | Luke "Jared" Bennett | 2017-11-13 | 4 | -0/+48 |
| | | | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |