summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch '40127-spinach-deprecation' into 'master'Sean McGivern2017-11-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Spinach deprecation" Closes #40127 See merge request gitlab-org/gitlab-ce!15365
| * | | | | | | | | | | | Use #query_scope instead of #parent in a Spinach featureRémy Coutable2017-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-147-56/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-forksJames Edwards-Jones2017-11-096-19/+57
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Moved LfsIntegrity specs to own fileJames Edwards-Jones2017-11-082-37/+59
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'limit_ee_conflicts-gitlab-svgs' into 'master'Sean McGivern2017-11-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update limit_ee_conflicts.md with assets/gitlab-svgs conflict resolution. See merge request gitlab-org/gitlab-ce!15361
| * | | | | | | | | | | | | | Update limit_ee_conflicts.md with assets/gitlab-svgs conflict resolution.limit_ee_conflicts-gitlab-svgsLuke "Jared" Bennett2017-11-131-0/+6
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '38869-project' into 'master'Phil Hughes2017-11-145-164/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export project, projectAvatar and projectImport as ES6 modules See merge request gitlab-org/gitlab-ce!15355
| * | | | | | | | | | | | | Export project, projectAvatar and projectImport as ES6 modules38869-projectFilipa Lacerda2017-11-135-164/+142
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'gitaly-wiki-get-all-pages' into 'master'Rémy Coutable2017-11-147-23/+155
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-pagesAlejandro Rodríguez2017-11-137-23/+111
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add spec examples for Gitlab::Gitaly::WikiServiceAlejandro Rodríguez2017-11-131-0/+44
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'Tim Zallmann2017-11-135-14/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-removalBob Van Landuyt2017-11-135-14/+26
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '3615-improve-welcome-screen' into 'master'Tim Zallmann2017-11-137-102/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize landing page for new users See merge request gitlab-org/gitlab-ce!15191
| * | | | | | | | | | | | | | Use flexbox instead of bootstrap columns3615-improve-welcome-screenAnnabel Dunstone Gray2017-11-084-86/+97
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add new icon; update contentAnnabel Dunstone Gray2017-11-083-3/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add four blocks to each welcome pageAnnabel Dunstone Gray2017-11-082-10/+28
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update new project iconAnnabel Dunstone Gray2017-11-081-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add mobile stylesAnnabel Dunstone Gray2017-11-081-4/+15
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Reorganize landing page for new usersAnnabel Dunstone Gray2017-11-085-94/+120
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch ↵Annabel Dunstone Gray2017-11-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdown' into 'master' Resolve "Wrong case for 'Roles' header in 'Allowed to create' project settings dropdown" Closes #37174 See merge request gitlab-org/gitlab-ce!15326
| * | | | | | | | | | | | | | Add missing CSS class to capitalize the protectec tag header dropdown37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdownJose Ivan Vargas2017-11-101-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '40068-runner-sorting-regression' into 'master'Annabel Dunstone Gray2017-11-132-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert a regression on runners sorting (!15134) Closes #40068 See merge request gitlab-org/gitlab-ce!15341
| * | | | | | | | | | | | | | Revert a regression on runners sorting (!15134)Takuya Noguchi2017-11-122-1/+6
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '39436-pages-api-administrative' into 'master'Rémy Coutable2017-11-1311-23/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add administrative endpoint to list all pages domains Closes #39436 See merge request gitlab-org/gitlab-ce!15160
| * | | | | | | | | | | | | | Add administrative endpoint to list all pages domainsTravis Miller2017-11-1311-23/+172
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '38605-move-ee_compat_check-to-an-earlier-build-stage' into ↵Sean McGivern2017-11-131-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Speedup the `ee_compat_check` job Closes #38605 See merge request gitlab-org/gitlab-ce!15324
| * | | | | | | | | | | | | | Remove the custom cache definition for the ee_compat_check job and disallow ↵38605-move-ee_compat_check-to-an-earlier-build-stageRémy Coutable2017-11-101-5/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it to fail Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'issue_39238' into 'master'Sean McGivern2017-11-133-4/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix image diff notes email Closes #39238 See merge request gitlab-org/gitlab-ce!15299
| * | | | | | | | | | | | | Fix image diff notes emailFelipe Artur2017-11-133-4/+32
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '39842-fetch-ivar' into 'master'Rémy Coutable2017-11-134-6/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Utils::StrongMemoize Allows patterns like this: def trigger_from_token return @Trigger if defined?(@Trigger) @Trigger = Ci::Trigger.find_by_token(params[:token].to_s) end Closes #39842 See merge request gitlab-org/gitlab-ce!15222
| * | | | | | | | | | | | | | Add Gitlab::Utils::StrongMemoizeLin Jen-Shin (godfat)2017-11-134-6/+93
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix-subgroup-autocomplete' into 'master'Rémy Coutable2017-11-133-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix users autocomplete in a subgroup Closes #39452 See merge request gitlab-org/gitlab-ce!15350
| * | | | | | | | | | | | | Fix users autocomplete in a subgroupSean McGivern2017-11-133-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should include users who have access from parent groups, not just direct members of the current group.
* | | | | | | | | | | | | | Merge branch '38075_allow_refernce_integer_labels' into 'master'Filipa Lacerda2017-11-134-10/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix to allow integer label refernces See merge request gitlab-org/gitlab-ce!14607
| * | | | | | | | | | | | | | fix to allow integer label refernceshaseeb2017-11-134-10/+38
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-11-137-39/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 requestGeorge Andrinopoulos2017-11-117-39/+14
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dm-authorize-admin-oauth-application' into 'master'Sean McGivern2017-11-132-5/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent error when authorizing an admin-created OAauth application without a set owner Closes #40086 See merge request gitlab-org/gitlab-ce!15349
| * | | | | | | | | | | | | | | Prevent error when authorizing an admin-created OAauth application without a ↵Douwe Maan2017-11-132-5/+14
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set owner
* | | | | | | | | | | | | | | Merge branch '39335-add-time-spend-to-milestones' into 'master'Sean McGivern2017-11-136-0/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add total time spent to milestones Closes #39335 See merge request gitlab-org/gitlab-ce!15116
| * | | | | | | | | | | | | | Add externalized stringsGeorge Andrinopoulos2017-11-112-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add feature test to milestoneGeorge Andrinopoulos2017-11-112-0/+35
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move total time spend calculation to milestoneishGeorge Andrinopoulos2017-11-117-77/+24
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix static code analysis offenceGeorge Andrinopoulos2017-11-111-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix collapsed sidebar messages and iconGeorge Andrinopoulos2017-11-115-6/+18
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add total time spent to milestonesGeorge Andrinopoulos2017-11-115-0/+82
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'multi-editor-store-specs' into 'master'Filipa Lacerda2017-11-1313-11/+1907
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests to multi-file Vuex store See merge request gitlab-org/gitlab-ce!15147
| * | | | | | | | | | | | | | added missing specsmulti-editor-store-specsPhil Hughes2017-11-102-1/+212
| | | | | | | | | | | | | | |