summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update MR doc to indicate that the linear-history feature is available for ↵ff_port_from_eeValery Sizov2017-10-021-2/+0
| | | | CE as well
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-02215-4786/+7056
|\
| * Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-022-1/+6
| |\ | | | | | | | | | | | | | | | | | | Ensure all refs are restored on a backup/restore Closes #38352 See merge request gitlab-org/gitlab-ce!14595
| | * Ensure all refs are restored on a restore from backupsh-restore-all-refs-backupStan Hu2017-09-292-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | To restore all refs from a bundle, we need to use the --mirror option to ensure that all refs are properly restored. Without this, refs such as `refs/merge-requests/X` and `refs/keep-around/Y` would be omitted, which exposed a bug as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/38319#note_41648608. Closes #38352
| * | Merge branch 'Update-description-accept-mr' into 'master'Sean McGivern2017-10-021-0/+4
| |\ \ | | | | | | | | | | | | | | | | Update CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!14591
| | * | Update CONTRIBUTING.mdUpdate-description-accept-mrVictor Wu2017-09-291-0/+4
| | | |
| * | | Merge branch 'docs/add-changelog-lint' into 'master'Sean McGivern2017-10-021-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add changelog lint script to docs lint CI job See merge request gitlab-org/gitlab-ce!14618
| | * | | Add changelog lint script to docs lint CI jobAchilleas Pipinellis2017-10-021-0/+1
| | | | |
| * | | | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-0210-62/+231
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Implement OperationService.UserAddBranch Gitaly RPC Closes gitaly#544 See merge request gitlab-org/gitlab-ce!14522
| | * | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branchAlejandro Rodríguez2017-09-304-32/+152
| | | | |
| | * | | Populate `Gitlay::Repository`'s `gl_repository` fieldAlejandro Rodríguez2017-09-304-3/+48
| | | | |
| | * | | Add a factory for `Gitaly::GitCommit`sAlejandro Rodríguez2017-09-303-27/+31
| | | |/ | | |/|
| * | | Merge branch '34371-ca-vue' into 'master'Phil Hughes2017-10-027-35/+55
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Remove global components See merge request gitlab-org/gitlab-ce!14579
| | * | | Remove global componentsFilipa Lacerda2017-10-027-35/+55
| |/ / /
| * | | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-023-3/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure no exception is raised when Raven tries to get the current user in API context Closes #38571 See merge request gitlab-org/gitlab-ce!14580
| | * | | Ensure no exception is raised when Raven tries to get the current user in ↵38571-fix-exception-in-raven-reportRémy Coutable2017-09-293-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API context Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Merge branch ↵Tim Zallmann2017-10-029-70/+173
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34366-issue-sidebar-don-t-render-participants-in-collapsed-state' into 'master' Resolve "Issue Sidebar : Don't render participants in collapsed state" Closes #34366 See merge request gitlab-org/gitlab-ce!14270
| | * | | | use LazyImageTagHelper.placeholder_image for blank src base64 image34366-issue-sidebar-don-t-render-participants-in-collapsed-stateLuke "Jared" Bennett2017-10-011-1/+1
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-09-28340-2007/+2934
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 34366-issue-sidebar-don-t-render-participants-in-collapsed-state
| | * | | | | Added changelogLuke "Jared" Bennett2017-09-281-0/+5
| | | | | | |
| | * | | | | Only trigger loadCheck on open toggle, not close. Update specs and add ↵Luke "Jared" Bennett2017-09-284-65/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | right_sidebar_spec test for additions
| | * | | | | issuable_context_spec review changesLuke "Jared" Bennett2017-09-281-5/+5
| | | | | | |
| | * | | | | Finish issuable_context_specLuke "Jared" Bennett2017-09-281-10/+7
| | | | | | |
| | * | | | | Add issauble_context_specLuke "Jared" Bennett2017-09-281-0/+31
| | | | | | |
| | * | | | | Finish _participants view specLuke "Jared" Bennett2017-09-281-22/+7
| | | | | | |
| | * | | | | Update projects_helper_specLuke "Jared" Bennett2017-09-281-2/+2
| | | | | | |
| | * | | | | Add participants specLuke "Jared" Bennett2017-09-281-0/+41
| | | | | | |
| | * | | | | Conditionally call loadCheck if lazyLoader is presentLuke "Jared" Bennett2017-09-282-3/+2
| | | | | | |
| | * | | | | Trigger load of lazy images when opening sidebar, or clicking 'more ↵Luke "Jared" Bennett2017-09-282-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | participants'
| | * | | | | Add lazy_load option to participant avatar helperLuke "Jared" Bennett2017-09-282-3/+6
| | | | | | |
| * | | | | | Merge branch '38052-use-simple-api-for-projects' into 'master'Tim Zallmann2017-10-023-2/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `simple=true` for projects API in Projects dropdown for better search performance Closes #38052 See merge request gitlab-org/gitlab-ce!14585
| | * | | | | | Add changelog entry38052-use-simple-api-for-projectskushalpandya2017-09-291-0/+5
| | | | | | | |
| | * | | | | | Use `simple=true` for projects API for better performancekushalpandya2017-09-292-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-10-0215-778/+4918
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-i18n' into 'master' See merge request gitlab-org/gitlab-ce!14608
| | * | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-10-0115-778/+4918
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!2947
| * | | | | | | | Merge branch 'remote_user' into 'master'Douwe Maan2017-10-0212-40/+69
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GL_USERNAME environment variable for hooks See merge request gitlab-org/gitlab-ce!13264
| | * | | | | | | | add username to authorized result, so that gitlab-shell can pass it to hooksDavid Turner2017-09-294-8/+15
| | | | | | | | | |
| | * | | | | | | | Add username as GL_USERNAME in hooks (http)David Turner2017-09-299-34/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling pre-receive, post-receive, and update hooks, add the GitLab username as the GL_USERNAME environment variable. This patch only handles cases where pushes are over http, or via the web interface. Later, we will address the ssh case.
| | * | | | | | | | remove unused from_gitaly methodDavid Turner2017-09-291-4/+0
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'sh-fix-issue-38646' into 'master'Grzegorz Bizon2017-10-023-4/+23
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pushes to an empty repository not invalidating has_visible_content? cache Closes #38646 See merge request gitlab-org/gitlab-ce!14613
| | * | | | | | | | Fix pushes to an empty repository not invalidating has_visible_content? cacheStan Hu2017-10-013-4/+23
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Repository#has_visible_content?` used to rely on the cached count of local branches, but since it is now an independently cached value it needs to be invalidated on its own. Closes #38646
| * | | | | | | | Merge branch '38616-take-down-references-to-gitlab-chart-docs' into 'master'Achilleas Pipinellis2017-10-022-11/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates to Helm chart docs Closes #38616 See merge request gitlab-org/gitlab-ce!14589
| | * | | | | | | minor cleanup38616-take-down-references-to-gitlab-chart-docsJoshua Lambert2017-10-011-2/+2
| | | | | | | | |
| | * | | | | | | minor cleanupJoshua Lambert2017-09-301-1/+1
| | | | | | | | |
| | * | | | | | | updatesJoshua Lambert2017-09-301-3/+3
| | | | | | | | |
| | * | | | | | | Fix dead linkJoshua Lambert2017-09-301-1/+1
| | | | | | | | |
| | * | | | | | | updatesJoshua Lambert2017-09-302-8/+13
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'allow_n_plus_1_detection_bypass' into 'master'Robert Speicher2017-09-302-2/+32
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment variable to bypass n+1 See merge request gitlab-org/gitlab-ce!14451
| | * | | | | | | Add environment variable to bypass n+1Andrew Newdigate2017-09-302-2/+32
| |/ / / / / / /
| * | | | | | | Merge branch 'sh-fix-gitlab-qa-admin' into 'master'Grzegorz Bizon2017-09-301-9/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Admin -> License selector for GitLab QA specs Closes gitlab-qa#68 See merge request gitlab-org/gitlab-ce!14599
View Lorry Controller Status