summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] pushzj-tst-pushZeger-Jan van de Weg2017-08-1915-1653/+2579
* Merge branch 'winh-filtered-search-dropdowns' into 'master'Clement Ho2017-08-183-12/+20
|\
| * Make issuable filter dropdown style consistentWinnie Hellmann2017-08-183-12/+20
|/
* Merge branch 'repo-template-format-repo' into 'master'Clement Ho2017-08-181-3/+6
|\
| * Correct repo.vue templateLuke "Jared" Bennett2017-08-181-3/+6
|/
* Merge branch 'dm-commit-cache-i18n' into 'master'Robert Speicher2017-08-182-1/+6
|\
| * Describe what, not how, in changelog.dm-commit-cache-i18nDouwe Maan2017-08-181-1/+1
| * Add current locale to commit partial cache keyDouwe Maan2017-08-182-1/+6
* | Merge branch 'pawel/update_prometheus_client_gem_to_improve_performance_when_...Stan Hu2017-08-182-3/+3
|\ \
| * | Update prometheus mmap client library to fix performance issues when renderin...pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metricsPawel Chojnacki2017-08-182-3/+3
|/ /
* | Merge branch 'docs/clearcase' into 'master'Marcia Ramos2017-08-182-0/+48
|\ \
| * | Add docs: migrating from Clearcase to Git/GitLabdocs/clearcaseAchilleas Pipinellis2017-08-182-0/+48
| |/
* | Merge branch '36630-activerecord-statementinvalid-pg-notnullviolation-error-n...Grzegorz Bizon2017-08-182-1/+24
|\ \
| * | Fix MR diffs background migration when file modes are missing36630-activerecord-statementinvalid-pg-notnullviolation-error-null-value-in-column-a_mode-violates-not-null-constraintSean McGivern2017-08-182-1/+24
| |/
* | Merge branch 'docs/sm/36543-describe-supported-version-in-group_level_variabl...Achilleas Pipinellis2017-08-181-0/+4
|\ \
| * | Describe the supported version of group-level variables API in documentShinya Maeda2017-08-181-0/+4
|/ /
* | Merge branch 'docs/sm/fix_project_snippets_md' into 'master'Achilleas Pipinellis2017-08-181-1/+1
|\ \ | |/ |/|
| * Update project_snippets.mddocs/sm/fix_project_snippets_mdShinya Maeda2017-08-181-1/+1
* | Merge branch 'gitaly_ref_exists' into 'master'Sean McGivern2017-08-188-28/+106
|\ \
| * | Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-188-28/+106
| |/
* | Merge branch '36648-fix-backoff-util-tests' into 'master'Phil Hughes2017-08-182-29/+31
|\ \
| * | fix unnecessarily long gl.utils.backOff test36648-fix-backoff-util-testsMike Greiling2017-08-182-29/+31
* | | Merge branch '32795-project-activity-i18n' into 'master'Phil Hughes2017-08-186-18/+170
|\ \ \
| * | | Add support for i18n on Project Activity PageKushal Pandya2017-08-186-18/+170
|/ / /
* | | Merge branch 'mk-setup-settings-properly' into 'master'Douwe Maan2017-08-182-1/+34
|\ \ \
| * | | Setup repositories settings properlymk-setup-settings-properlyMichael Kozono2017-08-172-1/+14
| * | | Setup LDAP settings properlyMichael Kozono2017-08-172-0/+20
* | | | Merge branch '36041-notification-title' into 'master'Douwe Maan2017-08-186-43/+62
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't escape html entities when rich == raw line36041-notification-titleJarka Kadlecova2017-08-176-43/+62
* | | | Merge branch 'gitaly-apply-gitattributes' into 'master'Sean McGivern2017-08-184-27/+124
|\ \ \ \
| * | | | Incorporate RepositoryService.ApplyGitattributes Gitaly RPCgitaly-apply-gitattributesAlejandro Rodríguez2017-08-174-27/+61
| * | | | Add GitalyClient::RepositoryService specsAlejandro Rodríguez2017-08-171-0/+63
* | | | | Merge branch 'rename-repo-enabled' into 'master'Phil Hughes2017-08-182-10/+6
|\ \ \ \ \
| * | | | | use proper object notation and rename isNewRepo to isNewRepoEnabledrename-repo-enabledMike Greiling2017-08-172-10/+6
* | | | | | Merge branch 'tc-git-tower-pagination-links' into 'master'Grzegorz Bizon2017-08-183-10/+64
|\ \ \ \ \ \
| * | | | | | Total Pages should be at least onetc-git-tower-pagination-linksToon Claes2017-08-172-7/+13
| * | | | | | Add specs for pagination Link headerToon Claes2017-08-172-4/+52
| * | | | | | don't add next page link if current page is out of rangeJordan Patterson2017-08-171-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '36611-error-in-getcomposer-link' into 'master'🏖 Rémy Coutable 🏖2017-08-182-1/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix external link to Composer websiteMark Fletcher2017-08-172-1/+6
* | | | | | Merge branch 'winh-admin-user-actions-dropdown' into 'master'Clement Ho2017-08-173-1/+9
|\ \ \ \ \ \
| * | | | | | Make admin user actions dropdown consistentwinh-admin-user-actions-dropdownwinh2017-08-173-1/+9
| |/ / / / /
* | | | | | Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'Clement Ho2017-08-171-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixes the blown up emoji problem in notesTim Zallmann2017-08-171-1/+2
|/ / / / /
* | | | | Merge branch 'docs/docker-entrypoint' into 'master'Marcia Ramos2017-08-171-17/+23
|\ \ \ \ \
| * | | | | Properly explain when advanced Docker options were introduceddocs/docker-entrypointAchilleas Pipinellis2017-08-161-17/+23
* | | | | | Merge branch 'docs-article-undo-things-in-git' into 'master'Marcia Ramos2017-08-176-52/+551
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix conflictdocs-article-undo-things-in-gitMarcia Ramos2017-08-17650-4524/+9990
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'docs/importing-refactor' into 'master'Marcia Ramos2017-08-1731-518/+526
|\ \ \ \ \ \
| * | | | | | Move workflow/importing/ to user/project/import/Achilleas Pipinellis2017-08-1731-518/+526
| | |/ / / / | |/| | | |