summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace the 'project/merge_requests.feature' spinach test with an rspec analogreplace_project_merge_requests.featureVitaliy @blackst0ne Klachkov2017-10-0522-986/+773
|
* 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
| * | | | | | Fix Admin -> License selector for GitLab QA specsStan Hu2017-09-291-9/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Closes gitlab-qa#68
* | | | | | Merge branch 'sh-add-qa-docs' into 'master'Grzegorz Bizon2017-09-301-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab QA documentation See merge request gitlab-org/gitlab-ce!14600
| * | | | | | Add GitLab QA documentationStan Hu2017-09-291-0/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'patch-19' into 'master'Stan Hu2017-09-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | remove period See merge request gitlab-org/gitlab-ce!14598
| * | | | | remove periodBen Bodenmiller2017-09-301-1/+1
|/ / / / / | | | | | | | | | | [skip ci]
* | | | | Merge branch 'jramsay-38624-right-align' into 'master'Jacob Schatz2017-09-292-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrectly aligned last updated time Closes #38624 See merge request gitlab-org/gitlab-ce!14592
| * | | | | Fix incorrectly aligned last updated timeJames Ramsay2017-09-292-2/+2
|/ / / / /
* | | | | Merge branch 'gitaly-create-repository' into 'master'Douwe Maan2017-09-2915-48/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create repositories via Gitaly Closes gitaly#595 See merge request gitlab-org/gitlab-ce!14566
| * | | | | Create repositories via GitalyJacob Vosmaer2017-09-2915-48/+77
| |/ / / /
* | | | | Merge branch 'lint-changelog-yaml' into 'master'Robert Speicher2017-09-2914-34/+33
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add static analysis job to find invalid YAML in changelogs See merge request gitlab-org/gitlab-ce!14518
| * | | | Remove changelogs with invalid extensionsSean McGivern2017-09-298-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | All of these were in past releases, so missed their chance to be included in the main changelog :-(
| * | | | Extend changelog checker to test file extensionsSean McGivern2017-09-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Changelogs without a .yml extension won't be picked up, and will be ignored completely, so fail the pipeline when one of those is found.
| * | | | Fix invalid changelog entrieslint-changelog-yamlSean McGivern2017-09-272-2/+2
| | | | |
View Lorry Controller Status