Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-paths | Ahmad Sherif | 2017-11-14 | 1 | -10/+36 |
| | |||||
* | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master' | Yorick Peterse | 2017-11-14 | 1 | -1/+8 |
|\ | | | | | | | | | | | | | 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 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'fix-filter-by-my-reaction' into 'master' | Sean McGivern | 2017-11-14 | 1 | -1/+54 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+54 |
| | | | | |||||
* | | | | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master' | Kamil Trzciński | 2017-11-14 | 5 | -1/+141 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 116 | -1550/+3090 |
| |\ \ \ \ | |||||
| * | | | | | Add doc. Fix spec. Add erase_build in protected_ref rule | Shinya Maeda | 2017-11-07 | 5 | -14/+59 |
| | | | | | | |||||
| * | | | | | Fix spec. Revert update check. | Shinya Maeda | 2017-11-06 | 2 | -6/+22 |
| | | | | | | |||||
| * | | | | | Do not allow jobs to be erased | Shinya Maeda | 2017-11-06 | 1 | -0/+42 |
| | | | | | | |||||
* | | | | | | Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into ↵ | Kamil Trzciński | 2017-11-14 | 1 | -0/+24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+26 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+26 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master' | Douwe Maan | 2017-11-14 | 3 | -37/+98 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle forks in Gitlab::Checks::LfsIntegrity Closes #39902 See merge request gitlab-org/gitlab-ce!15279 | ||||
| * | | | | | | | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forks | James Edwards-Jones | 2017-11-09 | 2 | -0/+39 |
| | | | | | | | | |||||
| * | | | | | | | Moved LfsIntegrity specs to own file | James Edwards-Jones | 2017-11-08 | 2 | -37/+59 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'gitaly-wiki-get-all-pages' into 'master' | Rémy Coutable | 2017-11-14 | 1 | -0/+88 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's WikiService.WikiGetAllPages RPC Closes gitaly#722 See merge request gitlab-org/gitlab-ce!15307 | ||||
| * | | | | | | | | Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pages | Alejandro Rodríguez | 2017-11-13 | 1 | -0/+44 |
| | | | | | | | | | |||||
| * | | | | | | | | Add spec examples for Gitlab::Gitaly::WikiService | Alejandro Rodríguez | 2017-11-13 | 1 | -0/+44 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'bvl-refresh-member-listing-on-removal' into 'master' | Tim Zallmann | 2017-11-13 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't perform a JS request when deleting a membership. Closes #39933 and #31720 See merge request gitlab-org/gitlab-ce!15344 | ||||
| * | | | | | | | | Don't perform a JS request when deleting a membership.bvl-refresh-member-listing-on-removal | Bob Van Landuyt | 2017-11-13 | 2 | -1/+21 |
| | | | | | | | | | |||||
* | | | | | | | | | Add administrative endpoint to list all pages domains | Travis Miller | 2017-11-13 | 5 | -20/+90 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'issue_39238' into 'master' | Sean McGivern | 2017-11-13 | 1 | -1/+19 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix image diff notes email Closes #39238 See merge request gitlab-org/gitlab-ce!15299 | ||||
| * | | | | | | | | | Fix image diff notes email | Felipe Artur | 2017-11-13 | 1 | -1/+19 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Add Gitlab::Utils::StrongMemoize | Lin Jen-Shin (godfat) | 2017-11-13 | 1 | -0/+52 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-subgroup-autocomplete' into 'master' | Rémy Coutable | 2017-11-13 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix users autocomplete in a subgroup Closes #39452 See merge request gitlab-org/gitlab-ce!15350 | ||||
| * | | | | | | | | | Fix users autocomplete in a subgroup | Sean McGivern | 2017-11-13 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should include users who have access from parent groups, not just direct members of the current group. | ||||
* | | | | | | | | | | fix to allow integer label refernces | haseeb | 2017-11-13 | 2 | -9/+31 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch ↵ | Rémy Coutable | 2017-11-13 | 2 | -30/+0 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39602-move-update-project-counter-caches-out-of-issues-merge-requests' into 'master' Move update_project_counter_caches? out of issue and merge request Closes #39602 See merge request gitlab-org/gitlab-ce!15300 | ||||
| * | | | | | | | | | | Move update_project_counter_caches? out of issue and merge request | George Andrinopoulos | 2017-11-11 | 2 | -30/+0 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '39335-add-time-spend-to-milestones' into 'master' | Sean McGivern | 2017-11-13 | 2 | -0/+46 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add total time spent to milestones Closes #39335 See merge request gitlab-org/gitlab-ce!15116 | ||||
| * | | | | | | | | | | Add feature test to milestone | George Andrinopoulos | 2017-11-11 | 2 | -0/+35 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Move total time spend calculation to milestoneish | George Andrinopoulos | 2017-11-11 | 3 | -56/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add total time spent to milestones | George Andrinopoulos | 2017-11-11 | 2 | -0/+56 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'multi-editor-store-specs' into 'master' | Filipa Lacerda | 2017-11-13 | 11 | -5/+1901 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests to multi-file Vuex store See merge request gitlab-org/gitlab-ce!15147 | ||||
| * | | | | | | | | | added missing specsmulti-editor-store-specs | Phil Hughes | 2017-11-10 | 1 | -0/+211 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fixed specs | Phil Hughes | 2017-11-10 | 2 | -39/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | file action specs | Phil Hughes | 2017-11-10 | 1 | -1/+349 |
| | | | | | | | | | | |||||
| * | | | | | | | | | file action specs | Phil Hughes | 2017-11-10 | 1 | -0/+44 |
| | | | | | | | | | | |||||
| * | | | | | | | | | tree actions specs | Phil Hughes | 2017-11-10 | 2 | -5/+452 |
| | | | | | | | | | | |||||
| * | | | | | | | | | test updates | Phil Hughes | 2017-11-10 | 3 | -171/+120 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added tests to multi-file Vuex store | Phil Hughes | 2017-11-10 | 11 | -7/+930 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Export text utils as ES6 modules | Filipa Lacerda | 2017-11-13 | 2 | -84/+94 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master' | Tim Zallmann | 2017-11-12 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear filter on gl_dropdown open Closes #39564 See merge request gitlab-org/gitlab-ce!15214 | ||||
| * | | | | | | | | add feature spec to assert no linked filter inputs | Luke "Jared" Bennett | 2017-11-06 | 1 | -0/+22 |
| | | | | | | | | |