summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* backport popup varsslack_landing_page-ce-backportLuke "Jared" Bennett2017-11-131-0/+7
|
* url_utility and style backportLuke "Jared" Bennett2017-11-134-0/+48
|
* 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
| | | |
| * | | fixed specsPhil Hughes2017-11-102-39/+13
| | | |
| * | | file action specsPhil Hughes2017-11-101-1/+349
| | | |
| * | | file action specsPhil Hughes2017-11-101-0/+44
| | | |
| * | | tree actions specsPhil Hughes2017-11-102-5/+452
| | | |
| * | | test updatesPhil Hughes2017-11-104-172/+121
| | | |
| * | | Added tests to multi-file Vuex storePhil Hughes2017-11-1012-11/+934
| | | |
* | | | Merge branch 'zj-move-repo-exists-opt-out' into 'master'Sean McGivern2017-11-131-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Repository Exists check is OPT_OUT for Gitaly See merge request gitlab-org/gitlab-ce!15287
| * | | Repository Exists check is OPT_OUT for GitalyZeger-Jan van de Weg2017-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving more git operations to be executed by Gitaly, now the check if a repository exists is an opt out endpoint. Can be disabled, for the time being, by performing in the rails console: > Feature.get('gitaly_repository_exists').disable => true Part of gitlab-org/gitaly#314
* | | | Merge branch 'update-services-api-docs-for-kubernetes' into 'master'Douwe Maan2017-11-131-0/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Services API documentation for Kubernetes service See merge request gitlab-org/gitlab-ce!15343
| * | | | Update Services API documentation for Kubernetes serviceupdate-services-api-docs-for-kubernetesAthar Hameed2017-11-131-0/+35
| | | | |
* | | | | Merge branch 'text-utils' into 'master'Phil Hughes2017-11-1321-301/+326
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Export text utils as ES6 modules Closes #40018 and #37851 See merge request gitlab-org/gitlab-ce!15320
| * | | | Export text utils as ES6 modulesFilipa Lacerda2017-11-1321-301/+326
|/ / / /
* | | | Merge branch 'docs-40038-broken-link-on-projects-members-documentation-site' ↵Marcia Ramos2017-11-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix permissions link for project member docs Closes #40038 See merge request gitlab-org/gitlab-ce!15325
| * | | | Fix permissions link for project member docsMark Fletcher2017-11-101-1/+1
| | | | |
* | | | | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master'Tim Zallmann2017-11-122-1/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Clear filter on gl_dropdown open Closes #39564 See merge request gitlab-org/gitlab-ce!15214
| * | | | Change fix, instead of hacking in a filter clear every time, fix the root ↵39564-clear-filter-on-gitlab-dropdown-openLuke "Jared" Bennett2017-11-071-3/+1
| | | | | | | | | | | | | | | | | | | | cause by only selecting elements for that dropdown instance
| * | | | add feature spec to assert no linked filter inputsLuke "Jared" Bennett2017-11-061-0/+22
| | | | |
| * | | | Run filter method for filterable gl_dropdown instancesLuke "Jared" Bennett2017-11-061-0/+2
| | | | |
* | | | | Merge branch 'qa/gb/fix-page-refresh-address' into 'master'Grzegorz Bizon2017-11-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QA page refresh address by using absolute URLs Closes gitlab-qa#99 See merge request gitlab-org/gitlab-ce!15338
| * | | | | Fix QA page refresh address by using absolute URLsqa/gb/fix-page-refresh-addressGrzegorz Bizon2017-11-111-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This makes QA page refresh address to be absolute URL since we dropped `Capybara.app_host`, thus there is no support for relative URLs with `visit` now.
* | | | | Update CHANGELOG.md for 10.1.3Felipe Artur2017-11-1014-67/+16
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'revert-2f644452' into 'master'Mike Greiling2017-11-105-76/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'add-typescript' into 'master'" See merge request gitlab-org/gitlab-ce!15327
| * | | | | Revert "Merge branch 'add-typescript' into 'master'"Jacob Schatz2017-11-105-76/+140
|/ / / / / | | | | | | | | | | This reverts merge request !15264
* | | | | Merge branch 'winh-update-10-2-docs' into 'master'Oswaldo Ferreira2017-11-101-0/+360
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Add Update guide for 10.2 See merge request gitlab-org/gitlab-ce!15316
| * | | | Add Update guide for 10.2Winnie Hellmann2017-11-101-0/+360
|/ / / /
* | | | Merge branch 'rc/gitlab-qa-89' into 'master'Grzegorz Bizon2017-11-1010-21/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change Page::Main::Entry to only visit an entrypoint and introduce Page::Main::Login to handle actual log-in See merge request gitlab-org/gitlab-ce!15283
| * | | | Escape the password for Git callsRémy Coutable2017-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Change Page::Main::Entry to only visit an entrypoint and introduce ↵Rémy Coutable2017-11-109-20/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Page::Main::Login to handle actual log-in Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'Yorick Peterse2017-11-102-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix another timeout when searching for pipelines Closes #39054 See merge request gitlab-org/gitlab-ce!15322
View Lorry Controller Status