summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into persistent-calloutspersistent-calloutsMatija Čupić2018-02-0322-350/+664
|\
| * Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master'Filipa Lacerda2018-02-0221-346/+660
| |\ | | | | | | | | | | | | Refactor CI variable list code for usage with CI/CD settings page secret variables See merge request gitlab-org/gitlab-ce!16729
| | * Refactor CI variable list code for usage with CI/CD settings page secret ↵refactor-ci-variable-list-for-future-usage-in-4110Eric Eastwood2018-01-3121-346/+660
| | | | | | | | | | | | | | | | | | variables Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
| * | Merge branch '42729-rubocop-regular-expression-check-is-breaking-master' ↵Stan Hu2018-02-021-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Rubocop regular expression check is breaking master" Closes #42729 See merge request gitlab-org/gitlab-ce!16898
| | * | Use %r around multi-line regular expressionsDouwe Maan2018-02-021-4/+4
| |/ /
* | | Change UserCallout feautre_name to enumMatija Čupić2018-02-038-22/+42
| | |
* | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-02619-5021/+8644
|\ \ \ | |/ /
| * | Merge branch 'fix-eslint-axios' into 'master'Jacob Schatz2018-02-021-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate axios import Closes #42722 See merge request gitlab-org/gitlab-ce!16891
| | * | Remove duplicate axios importClement Ho2018-02-021-1/+0
| | | |
| * | | Merge branch '24167__color_label' into 'master'Douwe Maan2018-02-0214-4/+354
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095
| | * | | Fix minorsTony Rom2018-02-013-27/+19
| | | | |
| | * | | Add Colors to GitLab Flavored MarkdownTony Rom2018-01-2914-2/+360
| | | | |
| * | | | Merge branch 'webpack-auto-config' into 'master'Jacob Schatz2018-02-0215-63/+73
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatically Generate Webpack Entry Points See merge request gitlab-org/gitlab-ce!16865
| | * | | | migrate groups:show to static bundleMike Greiling2018-02-022-5/+2
| | | | | |
| | * | | | update nodemon watch configuration to restart dev-server when new entry ↵webpack-auto-configMike Greiling2018-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | points are added
| | * | | | move auto-generated bundle script tags after manual page-specific webpack ↵Mike Greiling2018-02-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | bundles
| | * | | | ensure dispatcher is run before other DOMContentLoaded handlersMike Greiling2018-02-012-7/+9
| | | | | |
| | * | | | migrate dashboard:milestones:index to static bundleMike Greiling2018-02-012-6/+1
| | | | | |
| | * | | | migrate projects:issues:show to static bundleMike Greiling2018-02-012-8/+3
| | | | | |
| | * | | | migrate projects:issues:index to static bundleMike Greiling2018-02-012-7/+2
| | | | | |
| | * | | | migrate projects:merge_requests:index to static bundleMike Greiling2018-02-012-5/+2
| | | | | |
| | * | | | migrate projects:show to static bundleMike Greiling2018-02-012-5/+2
| | | | | |
| | * | | | migrate projects:boards:* to static bundleMike Greiling2018-02-012-9/+2
| | | | | |
| | * | | | migrate sessions:new to static bundleMike Greiling2018-02-012-7/+2
| | | | | |
| | * | | | prevent dynamic chunks from being duplicated by the dispatcher until it is ↵Mike Greiling2018-02-012-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | completely refactored
| | * | | | update webpack helper to automatically include route-based entry pointsMike Greiling2018-02-012-0/+19
| | | | | |
| | * | | | generate webpack entry points for pages directory automaticallyMike Greiling2018-02-013-1/+14
| | | | | |
| * | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵Douwe Maan2018-02-026-17/+113
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!16821
| | * | | | | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-016-17/+113
| | | | | | |
| * | | | | | Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ↵Douwe Maan2018-02-023-1/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Avoid error when creating forks and restricted levels are defined Closes #42607 See merge request gitlab-org/gitlab-ce!16881
| | * | | | | | Avoid error when no restricted levels are definedbvl-fix-500-on-fork-without-restricted-visibility-levelsBob Van Landuyt2018-02-023-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no visibility levels are defined they could sometimes return `nil` instead of an empty array. In this case we want to allow all levels.
| * | | | | | | Merge branch '37698-current-settings' into 'master'Sean McGivern2018-02-0296-324/+247
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use Gitlab::UserSettings directly as a singleton instead of including/extending it Closes #37698 See merge request gitlab-org/gitlab-ce!16843
| | * | | | | | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-0296-324/+247
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | including/extending it
| * | | | | | Merge branch 'ph-axios-2' into 'master'Filipa Lacerda2018-02-0219-588/+719
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More conversions to axios See merge request gitlab-org/gitlab-ce!16800
| | * | | | | | added missing calls in catch statementsph-axios-2Phil Hughes2018-02-022-3/+10
| | | | | | | |
| | * | | | | | fixed issue with axios_utils not reducing activeVueResources variable when ↵Phil Hughes2018-02-022-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request fails
| | * | | | | | Merge branch 'master' into ph-axios-2Phil Hughes2018-02-01112-442/+561
| | |\ \ \ \ \ \
| | * | | | | | | fixed axios mock not being restoredPhil Hughes2018-02-011-0/+4
| | | | | | | | |
| | * | | | | | | remove useless ajaxPost methodPhil Hughes2018-02-013-21/+6
| | | | | | | | |
| | * | | | | | | fixed notes_spec.jsPhil Hughes2018-02-011-58/+124
| | | | | | | | |
| | * | | | | | | fixed issue_spec transient failurePhil Hughes2018-01-311-32/+27
| | | | | | | | |
| | * | | | | | | fixed eslint :see_no_evil:Phil Hughes2018-01-312-2/+0
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into ph-axios-2Phil Hughes2018-01-31124-1309/+2600
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | fixed eslintPhil Hughes2018-01-311-2/+1
| | | | | | | | |
| | * | | | | | | Converted common_utils to axiosPhil Hughes2018-01-313-17/+19
| | | | | | | | |
| | * | | | | | | Converted ajax_cache to axiosPhil Hughes2018-01-312-60/+41
| | | | | | | | |
| | * | | | | | | Converted milestone_select.js to axiosPhil Hughes2018-01-311-61/+58
| | | | | | | | |
| | * | | | | | | Converted milestone.js to axiosPhil Hughes2018-01-311-10/+8
| | | | | | | | |
| | * | | | | | | fixed failing specsPhil Hughes2018-01-316-34/+43
| | | | | | | | |
| | * | | | | | | Converted merge_request_tabs.js to axiosPhil Hughes2018-01-302-51/+84
| | | | | | | | |
View Lorry Controller Status