summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partialRobert Speicher2018-01-161-21/+14
* Merge branch '37898-increase-readability-of-colored-text-in-job-output-log' i...Annabel Dunstone Gray2018-01-162-15/+19
|\
| * fix readability xterm colorsDanny2018-01-162-15/+19
|/
* Merge branch '42047-pg-10-support' into 'master'Nick Thomas2018-01-165-4/+66
|\
| * 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.mdJJ Asghar2018-01-161-2/+3
* | | Merge branch '40818-last-push-widget-does-not-appear-after-pushing-new-commit...Rémy Coutable2018-01-165-6/+47
|\ \ \ | |/ / |/| |
| * | Last push widget will show banner for new pushes to previously merged branchDrew Blessing2018-01-155-6/+47
* | | Merge branch 'fix/pipeline-header-padding' into 'master'Filipa Lacerda2018-01-162-0/+2
|\ \ \
| * | | 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 designwinh-style-modalsWinnie Hellmann2018-01-117-12/+42
* | | | | Merge branch 'builds-api-nplusone' into 'master'Stan Hu2018-01-164-4/+52
|\ \ \ \ \
| * | | | | 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
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 dispatcher-proj...Simon Knox2018-01-1692-873/+2072
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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 dispatcher-proj...Simon Knox2018-01-1592-919/+1180
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | 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"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 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-mergeSean McGivern2018-01-163-0/+14
| * | | | | | | | | Fix project search results for digits surrounded by colonsSean McGivern2018-01-165-23/+39