Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backport /api/v4/groups N+1 query check from EEsh-backport-groups-api-optimization | Stan Hu | 2018-02-03 | 1 | -0/+15 |
| | |||||
* | Merge branch ↵ | Grzegorz Bizon | 2018-02-03 | 3 | -23/+28 |
|\ | | | | | | | | | | | | | | | | | 'fix/remove-duplicated-logic-between-model-and-lib-in-find-branch' into 'master' Remove repo reloading logic from Repository#find_branch Closes #42609 See merge request gitlab-org/gitlab-ce!16815 | ||||
| * | Remove repo reloading logic from Repository#find_branchfix/remove-duplicated-logic-between-model-and-lib-in-find-branch | Ahmad Sherif | 2018-02-02 | 3 | -23/+28 |
| | | | | | | | | | | | | Gitlab::Git::Repository#find_branch has a similar logic. Fixes #42609 | ||||
* | | Merge branch 'fix-migration-timestamp' into 'master' | Stan Hu | 2018-02-03 | 1 | -0/+21 |
|\ \ | | | | | | | | | | | | | Update labels migration timestamp to run earlier than the one that removes namespaces to avoid issues See merge request gitlab-org/gitlab-ce!16907 | ||||
| * | | fix rubocopfix-migration-timestamp | James Lopez | 2018-02-03 | 1 | -0/+2 |
| | | | |||||
| * | | add migration before 20171207150343 | James Lopez | 2018-02-03 | 1 | -0/+19 |
| | | | |||||
* | | | Merge branch 'patch-1' into 'master' | Stan Hu | 2018-02-03 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | Fix spelling of “discrepancy” in GitHub→GitLab project import docs See merge request gitlab-org/gitlab-ce!16905 | ||||
| * | | Fix spelling of “discrepancy” in GitHub→GitLab project import docs | Rory O’Kane | 2018-02-02 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master' | Filipa Lacerda | 2018-02-02 | 21 | -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-4110 | Eric Eastwood | 2018-01-31 | 21 | -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 Hu | 2018-02-02 | 1 | -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 expressions | Douwe Maan | 2018-02-02 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge branch 'fix-eslint-axios' into 'master' | Jacob Schatz | 2018-02-02 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate axios import Closes #42722 See merge request gitlab-org/gitlab-ce!16891 | ||||
| * | | | Remove duplicate axios import | Clement Ho | 2018-02-02 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch '24167__color_label' into 'master' | Douwe Maan | 2018-02-02 | 14 | -4/+354 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095 | ||||
| * | | | | Fix minors | Tony Rom | 2018-02-01 | 3 | -27/+19 |
| | | | | | |||||
| * | | | | Add Colors to GitLab Flavored Markdown | Tony Rom | 2018-01-29 | 14 | -2/+360 |
| | | | | | |||||
* | | | | | Merge branch 'webpack-auto-config' into 'master' | Jacob Schatz | 2018-02-02 | 15 | -63/+73 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Automatically Generate Webpack Entry Points See merge request gitlab-org/gitlab-ce!16865 | ||||
| * | | | | | migrate groups:show to static bundle | Mike Greiling | 2018-02-02 | 2 | -5/+2 |
| | | | | | | |||||
| * | | | | | update nodemon watch configuration to restart dev-server when new entry ↵webpack-auto-config | Mike Greiling | 2018-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | points are added | ||||
| * | | | | | move auto-generated bundle script tags after manual page-specific webpack ↵ | Mike Greiling | 2018-02-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | bundles | ||||
| * | | | | | ensure dispatcher is run before other DOMContentLoaded handlers | Mike Greiling | 2018-02-01 | 2 | -7/+9 |
| | | | | | | |||||
| * | | | | | migrate dashboard:milestones:index to static bundle | Mike Greiling | 2018-02-01 | 2 | -6/+1 |
| | | | | | | |||||
| * | | | | | migrate projects:issues:show to static bundle | Mike Greiling | 2018-02-01 | 2 | -8/+3 |
| | | | | | | |||||
| * | | | | | migrate projects:issues:index to static bundle | Mike Greiling | 2018-02-01 | 2 | -7/+2 |
| | | | | | | |||||
| * | | | | | migrate projects:merge_requests:index to static bundle | Mike Greiling | 2018-02-01 | 2 | -5/+2 |
| | | | | | | |||||
| * | | | | | migrate projects:show to static bundle | Mike Greiling | 2018-02-01 | 2 | -5/+2 |
| | | | | | | |||||
| * | | | | | migrate projects:boards:* to static bundle | Mike Greiling | 2018-02-01 | 2 | -9/+2 |
| | | | | | | |||||
| * | | | | | migrate sessions:new to static bundle | Mike Greiling | 2018-02-01 | 2 | -7/+2 |
| | | | | | | |||||
| * | | | | | prevent dynamic chunks from being duplicated by the dispatcher until it is ↵ | Mike Greiling | 2018-02-01 | 2 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | completely refactored | ||||
| * | | | | | update webpack helper to automatically include route-based entry points | Mike Greiling | 2018-02-01 | 2 | -0/+19 |
| | | | | | | |||||
| * | | | | | generate webpack entry points for pages directory automatically | Mike Greiling | 2018-02-01 | 3 | -1/+14 |
| | | | | | | |||||
* | | | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵ | Douwe Maan | 2018-02-02 | 6 | -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 key | Rubén Dávila | 2018-02-01 | 6 | -17/+113 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ↵ | Douwe Maan | 2018-02-02 | 3 | -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-levels | Bob Van Landuyt | 2018-02-02 | 3 | -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 McGivern | 2018-02-02 | 96 | -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 Ossa | 2018-02-02 | 96 | -324/+247 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | including/extending it | ||||
* | | | | | | | Merge branch 'ph-axios-2' into 'master' | Filipa Lacerda | 2018-02-02 | 19 | -588/+719 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More conversions to axios See merge request gitlab-org/gitlab-ce!16800 | ||||
| * | | | | | | | added missing calls in catch statementsph-axios-2 | Phil Hughes | 2018-02-02 | 2 | -3/+10 |
| | | | | | | | | |||||
| * | | | | | | | fixed issue with axios_utils not reducing activeVueResources variable when ↵ | Phil Hughes | 2018-02-02 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request fails | ||||
| * | | | | | | | Merge branch 'master' into ph-axios-2 | Phil Hughes | 2018-02-01 | 112 | -442/+561 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixed axios mock not being restored | Phil Hughes | 2018-02-01 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | remove useless ajaxPost method | Phil Hughes | 2018-02-01 | 3 | -21/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | fixed notes_spec.js | Phil Hughes | 2018-02-01 | 1 | -58/+124 |
| | | | | | | | | | |||||
| * | | | | | | | | fixed issue_spec transient failure | Phil Hughes | 2018-01-31 | 1 | -32/+27 |
| | | | | | | | | | |||||
| * | | | | | | | | fixed eslint :see_no_evil: | Phil Hughes | 2018-01-31 | 2 | -2/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into ph-axios-2 | Phil Hughes | 2018-01-31 | 124 | -1309/+2600 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | fixed eslint | Phil Hughes | 2018-01-31 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Converted common_utils to axios | Phil Hughes | 2018-01-31 | 3 | -17/+19 |
| | | | | | | | | |