summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* simplify link_to callproject-page-clearerPhil Hughes2017-09-221-4/+2
|
* Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-223-7/+11
| | | | | This was caused by the `@projects` value being empty when the current user does not have any personal projects.
* Add context tabs to dashboard/projectsPhil Hughes2017-09-225-0/+50
| | | | | | | | | This allows users to quickly switch between all projects they have access to & there own namespace projects. These tabs also keep the same filtering/search options selected so the user can quickly switch between the two different contexts. Closes #29045
* Merge branch '38197-fix-ImapAuthenticationCheck' into 'master'Douwe Maan2017-09-222-17/+33
|\ | | | | | | | | | | | | Fix `rake gitlab:incoming_email:check` Closes #38197 See merge request gitlab-org/gitlab-ce!14423
| * Fix rake gitlab:incoming_email:check and make it38197-fix-ImapAuthenticationCheckLin Jen-Shin2017-09-222-17/+33
| | | | | | | | report error properly, so that we know what's really wrong.
* | Merge branch '38234-reserve-refs-replace' into 'master'Rémy Coutable2017-09-222-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Reserve refs/replace because `git-replace` is using it Closes #38234 See merge request gitlab-org/gitlab-ce!14436
| * | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replaceLin Jen-Shin2017-09-222-0/+6
| | | | | | | | | | | | | | | | | | See: * https://www.kernel.org/pub/software/scm/git/docs/git-replace.html * https://git-scm.com/book/en/v2/Git-Tools-Replace
* | | Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master'Rémy Coutable2017-09-223-10/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds gitlab features and components to usage ping data. Closes #33328 See merge request gitlab-org/gitlab-ce!14305
| * | | Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-componentsTiago Botelho2017-09-213-10/+77
| | | |
* | | | Merge branch 'sh-blob-raw-check' into 'master'Douwe Maan2017-09-222-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure that Blob.raw returns always returns a valid blob object See merge request gitlab-org/gitlab-ce!14412
| * | | | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-checkStan Hu2017-09-212-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ee!2976, we saw that a given OID could point to a commit, which would cause the delta size check to fail. Gitaly already returns nil if the OID isn't a blob, so this change makes the Rugged implementation consistent.
* | | | Merge branch '32782-i18n-support-pagination' into 'master'Tim Zallmann2017-09-222-79/+100
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add i18n support to pagination widget See merge request gitlab-org/gitlab-ce!14407
| * | | | Add unextracted strings for i18n32782-i18n-support-paginationkushalpandya2017-09-211-75/+94
| | | | |
| * | | | Add i18n support for pagination testkushalpandya2017-09-211-4/+6
| | | | |
* | | | | Merge branch 'emoji-dom-size' into 'master'Fatih Acet2017-09-222-6/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve emoji menu rendering performance Closes #36949 See merge request gitlab-org/gitlab-ce!14233
| * | | | | Remove eslint-disable, and use arrow function.emoji-dom-sizeBryce Johnson2017-09-201-3/+2
| | | | | |
| * | | | | Reverse order in showMenuElement for readability.Bryce Johnson2017-09-201-2/+2
| | | | | |
| * | | | | Move display:none to emoji-menu base class.Bryce Johnson2017-09-201-4/+1
| | | | | |
| * | | | | Remove emoji-menu from the render tree when hidden.Bryce Johnson2017-09-192-6/+47
| | | | | |
* | | | | | Merge branch '38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docs' ↵Achilleas Pipinellis2017-09-221-15/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix bad link on GitLab Omnibus Helm chart page - docs Closes #38016 See merge request gitlab-org/gitlab-ce!14346
| * | | | | | Fix link, resolve inconsistent examples38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docsJoshua Lambert2017-09-181-15/+3
| | | | | | |
* | | | | | | Merge branch 'backport-ee-2983' into 'master'Rémy Coutable2017-09-221-6/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Simplify a test See merge request gitlab-org/gitlab-ce!14415
| * | | | | | Simplify a testNick Thomas2017-09-211-6/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '36231-better-svg-usage-in-the-frontend' into 'master'Phil Hughes2017-09-2274-280/+3885
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Better SVG Usage in the Frontend" Closes #36231 See merge request gitlab-org/gitlab-ce!13435
| * | | | | | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-2274-280/+3885
|/ / / / / /
* | | | | | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-226-12/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394
| * | | | | | Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-206-12/+53
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'docs/fix-review-docs-cleanup-job' into 'master'Rémy Coutable2017-09-221-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not clone the repo when running the review-docs jobs See merge request gitlab-org/gitlab-ce!14420
| * | | | | | Do not clone the repo when running the review-docs jobsdocs/fix-review-docs-cleanup-jobAchilleas Pipinellis2017-09-211-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we checked out the branch and ran the script from there. However, when the MR got merged and the cleanup job was run it would fail since it could not find the now deleted branch. This commit rather downloads the script from GitLab and skips downloading the artifacts/dependencies/cache to speed up the process.
* | | | | | | Merge branch 'replace_project_service.feature' into 'master'Rémy Coutable2017-09-2219-338/+347
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/service.feature' spinach test with an rspec analog Closes #23036 See merge request gitlab-org/gitlab-ce!14432
| * | | | | | | Replace the 'project/service.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-2219-338/+347
| | | | | | | |
* | | | | | | | Merge branch 'voogsgerd/gitlab-ce-daniel-legacy-config' into 'master'Rémy Coutable2017-09-222-6/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed two legacy config options See merge request gitlab-org/gitlab-ce!14425
| * | | | | | | | Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-configDaniel Voogsgerd2017-09-212-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the max_size and timeout options from the git config in gitlab.yml.
* | | | | | | | | Merge branch 'fix-multi-line-hook-output' into 'master'Rémy Coutable2017-09-223-4/+11
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display full pre-receive and post-receive hook output in GitLab UI Closes #25214 See merge request gitlab-org/gitlab-ce!14222
| * | | | | | | | Display full pre-receive and post-receive hook output in GitLab UIRobin Bobbitt2017-09-213-4/+11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'acet-fix-double-note-render' into 'master'Jacob Schatz2017-09-225-19/+47
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429
| * | | | | | | Fix rendering double note issue.Fatih Acet2017-09-225-19/+47
| | | | | | | |
* | | | | | | | Merge branch 'acet-switch-markdown-pane' into 'master'Jacob Schatz2017-09-221-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssueNotes: Switch back to Write pane when note cancel or submit. Closes #37907 See merge request gitlab-org/gitlab-ce!14402
| * | | | | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-paneFatih Acet2017-09-221-1/+3
|/ / / / / / /
* | | | | | | Merge branch 'winh-upgrade-nokogiri' into 'master'Robert Speicher2017-09-212-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Nokogiri because of CVE-2017-9050 See merge request gitlab-org/gitlab-ce!14427
| * | | | | | | Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-212-5/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-212-0/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
| * | | | | | | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-212-0/+22
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'tc-bump-version-10.1-pre' into 'master'Robert Speicher2017-09-211-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump VERSION to 10.1.0-pre [ci skip] See merge request gitlab-org/gitlab-ce!14426
| * | | | | | Bump VERSION to 10.1.0-preToon Claes2017-09-211-1/+1
|/ / / / / /
* | | | | | Merge branch 'cache-csrf-token' into 'master'Phil Hughes2017-09-215-12/+112
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize access to CSRF token in JavaScript Closes #37773 See merge request gitlab-org/gitlab-ce!14241
| * | | | | | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-215-12/+112
|/ / / / / /
* | | | | | Merge branch 'hide-frontmatter-help-page' into 'master'Robert Speicher2017-09-211-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show YAML frontmatter for doc pages under /help See merge request gitlab-org/gitlab-ce!14345
| * | | | | | Do not show YAML frontmatter for doc pages under /helpAchilleas Pipinellis2017-09-191-2/+8
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recently started adding YAML frontmatter in docs so that we can show more information, but that only works for the docs portal at docs.gitlab.com. For example, we want to add a last_updated entry https://gitlab.com/gitlab-org/gitlab-ce/issues/37677 Whereas this is useful for the docs portal, it looks ugly for docs under /help.
* | | | | | Merge branch 'force-two-up-view' into 'master'Filipa Lacerda2017-09-212-6/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force two up view Closes #32613 See merge request gitlab-org/gitlab-ce!14397
View Lorry Controller Status