summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Restore custom height for projects dropdown42035-projects-dropdown-scrollAnnabel Dunstone Gray2018-01-162-1/+3
|
* Merge branch '37898-increase-readability-of-colored-text-in-job-output-log' ↵Annabel Dunstone Gray2018-01-162-15/+19
|\ | | | | | | | | | | | | | | | | into 'master' fix readability xterm colors Closes #37898 See merge request gitlab-org/gitlab-ce!15921
| * fix readability xterm colorsDanny2018-01-162-15/+19
|/
* Merge branch '42047-pg-10-support' into 'master'Nick Thomas2018-01-165-4/+66
|\ | | | | | | | | | | | | Resolve "postgresql 10 support for GitLab" Closes #42047 See merge request gitlab-org/gitlab-ce!16471
| * Update seed-fu to a version compatible with postgresql 10Nick Thomas2018-01-163-3/+12
| |
| * Support PostgreSQL 10Nick Thomas2018-01-163-1/+54
| |
* | Merge branch 'patch-28' into 'master'Rémy Coutable2018-01-161-2/+3
|\ \ | | | | | | | | | | | | Update test-and-deploy-ruby-application-to-heroku.md See merge request gitlab-org/gitlab-ce!16500
| * | Update test-and-deploy-ruby-application-to-heroku.mdJJ Asghar2018-01-161-2/+3
| | | | | | | | | | | | | | | | | | Converted from type to "stage" due to depreciation. Signed-off-by: JJ Asghar <jjasghar@gmail.com>
* | | Merge branch ↵Rémy Coutable2018-01-165-6/+47
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '40818-last-push-widget-does-not-appear-after-pushing-new-commit' into 'master' Last push widget will show banner for new pushes to previously merged branch Closes #40818 See merge request gitlab-org/gitlab-ce!15728
| * | Last push widget will show banner for new pushes to previously merged branchDrew Blessing2018-01-155-6/+47
| | | | | | | | | | | | | | | | | | Previously, the last push widget would only show when the branch never had a merge request associated with it - even merged or closed ones. Now the widget will disregard merge requests that are merged or closed.
* | | Merge branch 'fix/pipeline-header-padding' into 'master'Filipa Lacerda2018-01-162-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Add pipeline header padding See merge request gitlab-org/gitlab-ce!16496
| * | | Add pipeline header paddingGeorge Tsiolis2018-01-162-0/+2
| | | |
* | | | Merge branch 'winh-style-modals' into 'master'Tim Zallmann2018-01-167-12/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adjust modal style to new design See merge request gitlab-org/gitlab-ce!16310
| * | | | Adjust modal style to new designwinh-style-modalsWinnie Hellmann2018-01-117-12/+42
| | | | |
* | | | | Merge branch 'builds-api-nplusone' into 'master'Stan Hu2018-01-164-4/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "N+1 queries with /projects/:project_id/builds API endpoint" Closes #41957 See merge request gitlab-org/gitlab-ce!16445
| * | | | | Use preload instead of includes to avoid joinsbuilds-api-nplusoneMatija Čupić2018-01-152-2/+2
| | | | | |
| * | | | | Add missing newline in Jobs API specMatija Čupić2018-01-151-0/+1
| | | | | |
| * | | | | Extend N+1 Builds and Jobs API specsMatija Čupić2018-01-152-2/+24
| | | | | |
| * | | | | Fix N+1 builds query in Jobs list APIMatija Čupić2018-01-141-0/+1
| | | | | |
| * | | | | Add N+1 query spec for Jobs APIMatija Čupić2018-01-141-2/+13
| | | | | |
| * | | | | Eager load user, runner, pipeline and its creatorMatija Čupić2018-01-141-1/+3
| | | | | |
| * | | | | Fix N+1 in v3 builds APIMatija Čupić2018-01-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The N+1 issue was caused by loading the job_artifacts_archive for each job (build) individually. Including that in the builds AssociationRelation fixed the issue.
| * | | | | Add n plus one spec for v3 builds apiMatija Čupić2018-01-131-2/+14
| | | | | |
* | | | | | Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-163-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki uploaded files are missing" Closes #42031 See merge request gitlab-org/gitlab-ce!16499
| * | | | | | Fix links to uploaded files on wiki pagesNick Thomas2018-01-163-0/+17
| | | | | | |
* | | | | | | Merge branch 'print-list-of-available-backups' into 'master'Douwe Maan2018-01-162-1/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List backups avilable for restore See merge request gitlab-org/gitlab-ce!16465
| * | | | | | | Check for both backup filesprint-list-of-available-backupsBalasankar "Balu" C2018-01-161-1/+1
| | | | | | | |
| * | | | | | | Imitate other specsBalasankar "Balu" C2018-01-161-1/+1
| | | | | | | |
| * | | | | | | Try one expectation onlyBalasankar "Balu" C2018-01-161-2/+0
| | | | | | | |
| * | | | | | | Move conditional to a separate methodBalasankar "Balu" C2018-01-151-3/+5
| | | | | | | |
| * | | | | | | Run the code to be testedBalasankar "Balu" C2018-01-151-0/+1
| | | | | | | |
| * | | | | | | List available backups for restoreBalasankar "Balu" C2018-01-152-1/+13
| | | | | | | |
* | | | | | | | Merge branch 'dispatcher-projects-c' into 'master'Phil Hughes2018-01-168-41/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatcher changes for projects:c* views See merge request gitlab-org/gitlab-ce!16416
| * | | | | | | | typodispatcher-projects-cSimon Knox2018-01-161-1/+1
| | | | | | | | |
| * | | | | | | | add missing pages import for projects:compare:*Simon Knox2018-01-162-2/+8
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2018-01-1692-873/+2072
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatcher-projects-c
| * | | | | | | | | fix exportsSimon Knox2018-01-152-2/+6
| | | | | | | | | |
| * | | | | | | | | fix broken import path from mergeSimon Knox2018-01-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2018-01-1592-919/+1180
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | dispatcher-projects-c
| * | | | | | | | | export instancesSimon Knox2018-01-122-2/+2
| | | | | | | | | |
| * | | | | | | | | remove unusedSimon Knox2018-01-121-1/+0
| | | | | | | | | |
| * | | | | | | | | dispatcher pages for projects:clustersSimon Knox2018-01-123-12/+12
| | | | | | | | | |
| * | | | | | | | | dispatcher changes for projects:commit* viewsSimon Knox2018-01-125-24/+59
| | | | | | | | | |
* | | | | | | | | | 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.
View Lorry Controller Status