summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '42046-fork-icon' into 'master'41936-install-btnFatih Acet2018-01-163-3/+8
|\ | | | | | | | | | | | | Resolve "Icons on forks page are to big" Closes #42046 See merge request gitlab-org/gitlab-ce!16474
| * Resolve "Icons on forks page are to big"Simon Knox2018-01-163-3/+8
|/
* Merge branch '41796-update-auto-deployed-prometheus-scrape-config' into 'master'Kamil Trzciński2018-01-161-119/+81
|\ | | | | | | | | | | | | Update auto-deployed prometheus scrape config Closes #41796 See merge request gitlab-org/gitlab-ce!16306
| * Update prometheus.yml to reflect current Omnibus version41796-update-auto-deployed-prometheus-scrape-configJoshua Lambert2018-01-151-119/+81
| |
* | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-168-23/+53
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Cannot search with keyword "merge"" Closes #41666 See merge request gitlab-org/gitlab-ce!16462
| * | 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 '41921-follow-up-fixes' into 'master'Rémy Coutable2018-01-161-18/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor of buttons _dropdown partial Closes #41921 See merge request gitlab-org/gitlab-ce!16486
| * | | Refactor of buttons _dropdown partialMark Fletcher2018-01-161-18/+8
| | | | | | | | | | | | | | | | Remove block + interpolation to simplify the calls to link helpers
* | | | Merge branch 'master' into 'master'docs-comm-article-phoenix-app-gitlab-ciRémy Coutable2018-01-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typo in doc_styleguide.md See merge request gitlab-org/gitlab-ce!16481
| * | | | Fix typo in doc_styleguide.mdMica2018-01-151-1/+1
| | | | |
* | | | | Merge branch 'fix/profile-gpg-keys-column-width' into 'master'Rémy Coutable2018-01-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change user settings column width See merge request gitlab-org/gitlab-ce!16479
| * | | | | Change user settings column widthGeorge Tsiolis2018-01-161-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/activity-nav-inconsistent-capitalization' into 'master'Rémy Coutable2018-01-162-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix top-area inconsistent capitalization See merge request gitlab-org/gitlab-ce!16476
| * | | | | Fix top-area inconsistent capitalizationGeorge Tsiolis2018-01-162-4/+4
| |/ / / /
* | | | | Merge branch '41476-enable-project-milestons-deletion-via-api' into 'master'Rémy Coutable2018-01-164-0/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable Project Milestone Deletion via the API" Closes #41476 See merge request gitlab-org/gitlab-ce!16478
| * | | | | Enables Project Milestone Deletion via APIJacopo2018-01-164-0/+67
|/ / / / / | | | | | | | | | | | | | | | Enables project milestone deletion via DELETE /projects/:id/milestones/:milestone_id
* | | | | Merge branch 'issue_41460' into 'master'Sean McGivern2018-01-164-23/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error on changes tab when merge request cannot be created Closes #41460 See merge request gitlab-org/gitlab-ce!16409
| * | | | | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-154-23/+36
| | | | | |
* | | | | | Merge branch 'dispatcher-milestones' into 'master'Filipa Lacerda2018-01-166-7/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added imports for milestone dispatcher routes See merge request gitlab-org/gitlab-ce!16387
| * | | | | | fixed eslintdispatcher-milestonesPhil Hughes2018-01-151-1/+0
| | | | | | |
| * | | | | | correctly init GFMPhil Hughes2018-01-153-4/+4
| | | | | | |
| * | | | | | Added imports for milestone dispatcher routesPhil Hughes2018-01-156-6/+37
| | | | | | |
* | | | | | | Merge branch ↵Rémy Coutable2018-01-161-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42074-rspec-spec-lib-gitlab-background_migration-deserialize_merge_request_diffs_and_commits_spec-rb-spec-services-system_note_service_spec-rb-fails' into 'master' Resolve "rspec spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb spec/services/system_note_service_spec.rb fails" Closes #42074 See merge request gitlab-org/gitlab-ce!16487
| * | | | | | | Prevent background migration spec from polluting later modelsSean McGivern2018-01-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the schema changes after 20171114162227 for any of these models, and specs after this one use factories, then those factories will use the models with outdated column information cached. We shouldn't really use factories in migration specs, but this is a special case because there is a lot of git-related setup code in the model that would be painful to copy to the migration. Instead, we just manually reset the column information for the models we could pollute.
* | | | | | | | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-165-13/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
| * | | | | | | | fixed merge request specsPhil Hughes2018-01-161-2/+2
| | | | | | | | |
| * | | | | | | | Fixed merge request status badge not updating after mergingmr-status-box-updatePhil Hughes2018-01-155-11/+59
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'Sean McGivern2018-01-163-16/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Commit#uri_type to Gitaly Closes gitaly#915 See merge request gitlab-org/gitlab-ce!16453
| * | | | | | | | Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-155-18/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#915
* | | | | | | | | Merge branch '36571-ignore-root-in-repo' into 'master'Sean McGivern2018-01-163-2/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error while searching for text starting with slash "/"" Closes #36571 See merge request gitlab-org/gitlab-ce!16455
| * | | | | | | | | Move Regexp.escape(), fix formatting on tests.Andrew McCallum2018-01-162-4/+4
| | | | | | | | | |
| * | | | | | | | | Account for query of only forward slash(es).Andrew McCallum2018-01-152-2/+9
| | | | | | | | | |
| * | | | | | | | | Create intermediary variable for query value with leading slashes removed.Andrew McCallum2018-01-151-1/+3
| | | | | | | | | |
| * | | | | | | | | Fix spelling mistake.Andrew McCallum2018-01-151-2/+2
| | | | | | | | | |
| * | | | | | | | | Add space after comma per layout guidelines.Andrew McCallum2018-01-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Update 36571-ignore-root-in-repo.ymlAndrew McCallum2018-01-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Add changelogAndrew McCallum2018-01-151-0/+5
| | | | | | | | | |
| * | | | | | | | | Add scenario of searching within context of repository with root slash to tests.Andrew McCallum2018-01-151-0/+5
| | | | | | | | | |
| * | | | | | | | | Strip off leading slashes when searching in context of repository.Andrew McCallum2018-01-151-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue-30101' into 'master'Rémy Coutable2018-01-163-16/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 'removed assignee' note to include old assignee reference Closes #30101 See merge request gitlab-org/gitlab-ce!16301
| * | | | | | | | | Update 'removed assignee' note to include old assignee referenceMaurizio De Santis2018-01-093-16/+14
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Kamil Trzciński2018-01-161-13/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master' Include updated AutoDevOps template with Browser Performance using DinD Closes #41809 See merge request gitlab-org/gitlab-ce!16373
| * | | | | | | | | Update AutoDevOps template with browser performance fix41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runnerJoshua Lambert2018-01-101-13/+17
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-redirections' into 'master'Achilleas Pipinellis2018-01-163-5/+55
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: document new redirect for Disqus comments See merge request gitlab-org/gitlab-ce!16327
| * | | | | | | | | | Docs: document new redirect for Disqus commentsMarcia Ramos2018-01-163-5/+55
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '42055-update-marked-from-0.3.6-to-0.3.12' into 'master'Phil Hughes2018-01-163-4/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update marked to 0.3.12 Closes #42055 See merge request gitlab-org/gitlab-ce!16480
| * | | | | | | | | | Update marked from 0.3.6 to 0.3.12Takuya Noguchi2018-01-163-4/+9
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sh-remove-shared-runners-and-more' into 'master'Grzegorz Bizon2018-01-162-3/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove erroneous text in shared runners page that suggested more runners available Closes #42059 See merge request gitlab-org/gitlab-ce!16483
| * | | | | | | | | | Remove erroneous text in shared runners page that suggested more runners ↵sh-remove-shared-runners-and-moreStan Hu2018-01-152-3/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available Closes #42059
View Lorry Controller Status