Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed webpack bundle tag and entry for '/javascripts/usersusers-show-dispatcher-refactor | Constance Okoghenun | 2018-02-12 | 4 | -30/+29 |
* | remove webpack bundle tag for users:show | Constance Okoghenun | 2018-02-08 | 3 | -3/+5 |
* | Merge branch '40744-hashed-storage-specs' into 'master' | Sean McGivern | 2018-02-08 | 36 | -254/+349 |
|\ | |||||
| * | Use hashed storage in the specs40744-hashed-storage-specs | Nick Thomas | 2018-02-07 | 36 | -254/+349 |
* | | Merge branch '4852-migration-specs-fail-locally-if-no-geo-db-is-configured' i... | Nick Thomas | 2018-02-08 | 1 | -2/+7 |
|\ \ | |||||
| * | | Make resetting column information overridable in EE | Sean McGivern | 2018-02-08 | 1 | -2/+7 |
* | | | Merge branch 'bump-gitlab-shell-version-to-6-0-3' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bumps Gitlab Shell version to 6.0.3bump-gitlab-shell-version-to-6-0-3 | Tiago Botelho | 2018-02-08 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'feature/26598-clear-button-ci-lint' into 'master' | Clement Ho | 2018-02-08 | 4 | -8/+39 |
|\ \ | |||||
| * | | Added 'clear' button to ci lint editor | Lin Jen-Shin | 2018-02-08 | 4 | -8/+39 |
|/ / | |||||
* | | Merge branch 'docs-for-commits-linking-to-mrs' into 'master' | Sean McGivern | 2018-02-08 | 1 | -1/+14 |
|\ \ | |||||
| * | | Add docs for MR link in commit pagedocs-for-commits-linking-to-mrs | Sean McGivern | 2018-02-08 | 1 | -1/+14 |
* | | | Merge branch '180-qa-fix-api-spec' into 'master' | Grzegorz Bizon | 2018-02-08 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | don't check against a hardcoded user name180-qa-fix-api-spec | Brett Walker | 2018-02-08 | 1 | -2/+2 |
* | | | | Merge branch 'issues-in-subgroups' into 'master' | Sean McGivern | 2018-02-08 | 2 | -6/+4 |
|\ \ \ \ | |||||
| * | | | | Issues and merge requests in subgroups docs | Victor Wu 🌴Vacation Feb 10-18🌴 | 2018-02-08 | 2 | -6/+4 |
|/ / / / | |||||
* | | | | Merge branch 'update-docs-labels-ce' into 'master' | Marcia Ramos | 2018-02-08 | 25 | -119/+70 |
|\ \ \ \ | |||||
| * | | | | Update docs labels CE | Victor Wu 🌴Vacation Feb 10-18🌴 | 2018-02-08 | 25 | -119/+70 |
* | | | | | Merge branch '10-5-update-dependencies-license-list' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -9/+1259 |
|\ \ \ \ \ | |||||
| * | | | | | 10.5 Update the dependencies license list10-5-update-dependencies-license-list | Mark Fletcher | 2018-02-08 | 1 | -9/+1259 |
* | | | | | | Merge branch 'new-list-dropdown-ajax-refactor' into 'master' | Filipa Lacerda | 2018-02-08 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replaced $.get with axois.getnew-list-dropdown-ajax-refactor | Constance Okoghenun | 2018-02-08 | 1 | -3/+4 |
* | | | | | | | Merge branch 'docs-pages-https' into 'master' | Achilleas Pipinellis | 2018-02-08 | 2 | -5/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | wording | Marcia Ramos | 2018-02-08 | 1 | -1/+1 |
| * | | | | | | | un-index old blog post from doc, add the important content from the post to t...docs-pages-https | Marcia Ramos | 2018-01-31 | 2 | -5/+29 |
* | | | | | | | | Merge branch 'feature/oidc-groups-claim' into 'master' | Douwe Maan | 2018-02-08 | 7 | -7/+57 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add groups to OpenID Connect claims | Hassan Zamani | 2018-02-08 | 7 | -7/+57 |
* | | | | | | | | | Merge branch 'mr-show-dispatcher-refactor' into 'master' | Jacob Schatz | 2018-02-08 | 4 | -33/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Refactored merge_requests/show path in dispatcher.js | Constance Okoghenun | 2018-02-08 | 4 | -33/+35 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '10-5-update-templates' into 'master' | Marin Jankovski | 2018-02-08 | 8 | -6/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates10-5-update-templates | Mark Fletcher | 2018-02-08 | 8 | -6/+42 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '10-5-ce-update-guides' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -0/+361 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Create update guide for 10.510-5-ce-update-guides | Mark Fletcher | 2018-02-08 | 1 | -0/+361 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch '10-5-update-source-install-guide' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Update 10.5 source install guide | Mark Fletcher | 2018-02-08 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'osw-wip-commit-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add blurb about changing MRs to WIP through commitsosw-wip-commit-docs | Oswaldo Ferreira | 2018-02-04 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'bvl-pot-merge-conflicts-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add a note about merge conflicts in `gitlab.pot`bvl-pot-merge-conflicts-docs | Bob Van Landuyt | 2018-02-07 | 1 | -0/+3 |
* | | | | | | | | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ce | Yorick Peterse | 2018-02-08 | 5 | -34/+30 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | [docs] Info rescheduling background migrationsbvl-fix-concurrent-fork-network-migrations | Bob Van Landuyt | 2018-02-08 | 1 | -0/+12 |
| * | | | | | | | | | Handle uniqueness on fork_network_member creation | Bob Van Landuyt | 2018-02-08 | 1 | -4/+11 |
| * | | | | | | | | | Early migrations populating fork-networks: no-op | Bob Van Landuyt | 2018-02-08 | 3 | -30/+7 |
* | | | | | | | | | | Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitalysh-fix-rebase-in-progress-nplus-one | Stan Hu | 2018-02-08 | 1 | -3/+5 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'zj-namespace-gitaly-opt-out' into 'master' | Sean McGivern | 2018-02-08 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Move Namespace to Gitaly using OPT-OUT | Zeger-Jan van de Weg | 2017-12-13 | 1 | -4/+8 |
* | | | | | | | | | | Merge branch 'zj-n-1-root-show' into 'master' | Douwe Maan | 2018-02-08 | 1 | -4/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Don't allow N +1 calls from Root#show | Zeger-Jan van de Weg | 2018-02-07 | 1 | -4/+1 |
* | | | | | | | | | | Merge branch 'sh-nfs-ip-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ |