summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-mergeSean McGivern2018-01-163-0/+14
| | | | | | We should use this limit everywhere, but especially in project search results, where we could be highlighting very long single lines. (Typical examples: minified JavaScript, and JSON data files.)
* Fix project search results for digits surrounded by colonsSean McGivern2018-01-165-23/+39
| | | | | | | | A file containing /:\d+:/ in its contents would break the search results if those contents were part of the results, because we were splitting on colons, which can't work with untrusted input. Changing to use the null byte as a separator is much safer.
* Merge branch '42025-fix-issue-api' into 'master'Sean McGivern2018-01-153-2/+18
|\ | | | | | | | | [API] Fix creating issue when assignee_id is empty See merge request gitlab-org/gitlab-ce!16458
| * [API] Fix creating issue when assignee_id is empty42025-fix-issue-apiValery Sizov2018-01-153-2/+18
| | | | | | | | see https://gitlab.com/gitlab-org/gitlab-ce/issues/42025
* | Merge branch '41970-job-play-button' into 'master'Kamil Trzciński2018-01-153-9/+17
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Empty state for manual job - play button does not work" Closes #41970 See merge request gitlab-org/gitlab-ce!16426
| * | Remove extra period41970-job-play-buttonFilipa Lacerda2018-01-121-1/+1
| | |
| * | Improve testsFilipa Lacerda2018-01-121-2/+6
| | |
| * | Sets method post for playing actionFilipa Lacerda2018-01-123-8/+12
| | | | | | | | | | | | | | | Removes explanation text for non triggered job Adds tests
* | | Merge branch 'docs/sast-dast' into 'master'Marcia Ramos2018-01-154-3/+137
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port the SAST DAST doc examples from EE to CE Closes #42007 See merge request gitlab-org/gitlab-ce!16430
| * | | Add DAST to Auto DevOps docsdocs/sast-dastAchilleas Pipinellis2018-01-151-3/+34
| | | |
| * | | Port the SAST DAST doc examples from EE to CEAchilleas Pipinellis2018-01-123-0/+103
| | | |
* | | | Merge branch 'fix-duplication-circuit-breakers' into 'master'Douwe Maan2018-01-151-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix duplication in API::CircuitBreakers See merge request gitlab-org/gitlab-ce!16456
| * | | Fix duplication in API::CircuitBreakersSerdar Dogruyol2018-01-151-2/+2
| | | |
* | | | Merge branch 'dispatcher-projects-efi' into 'master'Phil Hughes2018-01-1510-37/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dynamic imports for projects:e/f/i See merge request gitlab-org/gitlab-ce!16417
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2018-01-1525-108/+365
| |\ \ \ \ | | | | | | | | | | | | | | | | | | dispatcher-projects-efi
| * | | | | dedupeSimon Knox2018-01-153-26/+20
| | | | | |
| * | | | | removed unneeded lint commentsdispatcher-projects-efiSimon Knox2018-01-151-2/+2
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2018-01-1591-919/+1180
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | dispatcher-projects-efi
| * | | | | | fix tests from broken importsSimon Knox2018-01-124-7/+9
| | | | | | |
| * | | | | | dynamic imports for projects:e/f/iSimon Knox2018-01-129-29/+120
| | | | | | |
* | | | | | | Merge branch ↵Grzegorz Bizon2018-01-152-6/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41546-count-query-for-issues-and-mrs-runs-twice-on-group-index' into 'master' Resolve "Count query for issues and MRs runs twice on group index" Closes #41546 See merge request gitlab-org/gitlab-ce!16314
| * | | | | | Fix double execution of COUNT query on group pages41546-count-query-for-issues-and-mrs-runs-twice-on-group-indexSean McGivern2018-01-092-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `finder.execute.count` twice will perform two queries, but these are all in the same file, so it's easy to just reuse them.
* | | | | | | Merge branch 'fj-41598-fixing-request-mime-type' into 'master'Douwe Maan2018-01-153-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing request json mime type Closes #41598 See merge request gitlab-org/gitlab-ce!16427
| * | | | | | | Fixing request json mime typeFrancisco Javier López2018-01-153-3/+16
|/ / / / / / /
* | | | | | | Merge branch 'snippets-dispatcher-refactor' into 'master'Phil Hughes2018-01-154-3/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher for snippets:* See merge request gitlab-org/gitlab-ce!16390
| * | | | | | | Use common form.jssnippets-dispatcher-refactorClement Ho2018-01-125-21/+6
| | | | | | | |
| * | | | | | | Fix eslintClement Ho2018-01-114-4/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into snippets-dispatcher-refactorClement Ho2018-01-11230-1467/+2886
| |\ \ \ \ \ \ \
| * | | | | | | | Code improvementsClement Ho2018-01-115-5/+7
| | | | | | | | |
| * | | | | | | | Refactor dispatcher for snippets:*Jacob Schatz2018-01-115-3/+44
| | | | | | | | |
* | | | | | | | | Merge branch 'dispatcher-project-mr' into 'master'Phil Hughes2018-01-152-0/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher project mr index path Closes #41341 See merge request gitlab-org/gitlab-ce!16399
| * | | | | | | | | Refactor dispatcher project mr index pathdispatcher-project-mrClement Ho2018-01-112-0/+21
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-log-when-user-blocked' into 'master'Douwe Maan2018-01-158-4/+140
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log and send a system hook if a blocked user attempts to login Closes #41633 See merge request gitlab-org/gitlab-ce!16451
| * | | | | | | | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-148-4/+140
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes #41633
* | | | | | | | | Merge branch 'dispatcher-branches-create' into 'master'Phil Hughes2018-01-152-2/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher project branches create path See merge request gitlab-org/gitlab-ce!16380
| * | | | | | | | | Remove unused create index.jsdispatcher-branches-createClement Ho2018-01-121-3/+0
| | | | | | | | | |
| * | | | | | | | | Fix eslint so that pipeline doesnt fail after megeClement Ho2018-01-111-1/+0
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into dispatcher-branches-createClement Ho2018-01-11403-2024/+4627
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor dispatcher project branches create pathClement Ho2018-01-113-1/+13
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Grzegorz Bizon2018-01-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve after_script docs in yaml/README.md See merge request gitlab-org/gitlab-ce!16444
| * | | | | | | | | | | Improve after_script docs in yaml/README.mdDamian Nowak2018-01-131-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-157-86/+147
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#can_be_merged? to Gitaly Closes gitaly#893 See merge request gitlab-org/gitlab-ce!16316
| * | | | | | | | | | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-117-86/+147
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ↵Annabel Dunstone Gray2018-01-128-56/+71
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Use toggle for subscribed/unsubscribed to notifications" Closes #16988 See merge request gitlab-org/gitlab-ce!16408
| * | | | | | | | | | | change loading prop behavior for subscriptions.vueMike Greiling2018-01-122-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | add missing commaMike Greiling2018-01-121-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | only show loading indicator in subscription toggle on initial data fetch16988-use-toggle-for-subscribed-unsubscribed-to-notificationsMike Greiling2018-01-121-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | add tooltip for notifications icon in collapsed sidebarMike Greiling2018-01-121-9/+29
| | | | | | | | | | | |
| * | | | | | | | | | | change notification bell icon from font-awesome to gitlab svgMike Greiling2018-01-121-8/+10
| | | | | | | | | | | |
| * | | | | | | | | | | update capybara specs for subscription toggleMike Greiling2018-01-122-16/+14
| | | | | | | | | | | |
View Lorry Controller Status