summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-0210-100/+208
* Merge branch 'docs-28814-clarify-artifacts-ref' into 'master'Grzegorz Bizon2017-09-282-1/+6
|\
| * Clarify artifact download via the API only accepts branch or tag name for refMark Fletcher2017-09-282-1/+6
* | Merge branch 'fix-translation-namespaces' into 'master'Filipa Lacerda2017-09-283-9/+9
|\ \
| * | Fixed missing namespaces on navigation translationsfix-translation-namespacesPhil Hughes2017-09-273-9/+9
* | | Merge branch 'mobile-images-lazy-load-check' into 'master'Tim Zallmann2017-09-282-1/+6
|\ \ \
| * | | karma spec fixesmobile-images-lazy-load-checkPhil Hughes2017-09-271-1/+1
| * | | Lazy load images in mobile sidebar & headerPhil Hughes2017-09-272-1/+6
* | | | Merge branch 'commit-side-by-side-comment' into 'master'Filipa Lacerda2017-09-283-3/+44
|\ \ \ \
| * | | | Fixes commit comments in side-by-side diff viewcommit-side-by-side-commentPhil Hughes2017-09-273-3/+44
* | | | | Merge branch 'zj-repo-gitaly' into 'master'Sean McGivern2017-09-283-19/+18
|\ \ \ \ \
| * \ \ \ \ Merge branch 'an-repo-gitaly' into 'zj-repo-gitaly'zj-repo-gitalyAlejandro Rodríguez2017-09-271-7/+1
| |\ \ \ \ \
| | * | | | | Rolling back change to n+1 detectionan-repo-gitalyAndrew Newdigate2017-09-271-7/+1
| |/ / / / /
| * | | | | RepositoryExists is always called with #gitaly_migrationZeger-Jan van de Weg2017-09-263-19/+18
| * | | | | Don't enforce gitaly request limits for distinct callsAlejandro Rodríguez2017-09-261-1/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'refactor-services' into 'master'Grzegorz Bizon2017-09-2825-57/+85
|\ \ \ \ \
| * | | | | refactor emails servicerefactor-servicesJames Lopez2017-09-287-14/+14
| * | | | | fix update serviceJames Lopez2017-09-281-1/+1
| * | | | | refactor users update serviceJames Lopez2017-09-2817-32/+32
| * | | | | refactor keys controllerJames Lopez2017-09-281-1/+7
| * | | | | refactor some controllers to make them EE friendlyJames Lopez2017-09-283-5/+21
| * | | | | fix specsJames Lopez2017-09-283-6/+6
| * | | | | fix users update serviceJames Lopez2017-09-281-3/+5
| * | | | | update initializersJames Lopez2017-09-282-2/+4
| * | | | | refactor services to match EE signatureJames Lopez2017-09-2817-41/+43
* | | | | | Merge branch '38476-improve-merge-jid-cleanup-on-merge-process' into 'master'Sean McGivern2017-09-283-10/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-273-10/+37
* | | | | | Merge branch 'rotated_profile_image' into 'master'Tim Zallmann2017-09-282-1/+7
|\ \ \ \ \ \
| * | | | | | Check orientation of profile imageGuilherme Vieira2017-09-272-1/+7
* | | | | | | Merge branch 'docs-38152-bump-recommended-mysql-version' into 'master'Achilleas Pipinellis2017-09-282-2/+9
|\ \ \ \ \ \ \
| * | | | | | | Change recommended MySQL version to 5.6Mark Fletcher2017-09-282-2/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'cleanup-css' into 'master'dj-test-pushAnnabel Dunstone Gray2017-09-271-6/+1
|\ \ \ \ \ \ \
| * | | | | | | Cleanup diff-notes-collapse csscleanup-cssClement Ho2017-09-261-6/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'docs/k8s' into 'master'Marcia Ramos2017-09-276-16/+92
|\ \ \ \ \ \ \
| * | | | | | | Add EEP to headingsAchilleas Pipinellis2017-09-271-7/+8
| * | | | | | | Add link to NGINX Ingress and change Auto DevOps descriptiondocs/k8sAchilleas Pipinellis2017-09-251-15/+15
| * | | | | | | Clean up Kubernetes integration docs pageAchilleas Pipinellis2017-09-256-7/+30
| * | | | | | | Add things that the k8s integration enablesAchilleas Pipinellis2017-09-251-2/+54
* | | | | | | | Merge branch 'winh-linting-locale' into 'master'Tim Zallmann2017-09-272-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix linting errors in locale/index.jswinh-linting-localeWinnie Hellmann2017-09-272-4/+3
* | | | | | | | | Merge branch 'acet-repo-editor-fix-link-linking' into 'master'Jacob Schatz2017-09-274-152/+167
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change repo view hll color.acet-repo-editor-fix-link-linkingFatih Acet2017-09-251-0/+4
| * | | | | | | | | Fix line_highlighter_spec.Fatih Acet2017-09-251-6/+12
| * | | | | | | | | RepoEditor: Implement line and range linking.Fatih Acet2017-09-222-146/+151
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'breadcrumbs-line-height-padding' into 'master'Annabel Dunstone Gray2017-09-272-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Breadcrumbs receives padding when double linedDimitrie Hoekstra2017-09-272-1/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch 'gitaly-docs' into 'master'Robert Speicher2017-09-272-0/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added some Gitaly docs to `docs/development`Andrew Newdigate2017-09-272-0/+55
|/ / / / / / / / /
* | | | | | | | | Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master'Kamil Trzciński2017-09-2721-371/+1007
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add some minor improvements to pipeline creation chainbackstage/gb/refactor-pipeline-create-serviceGrzegorz Bizon2017-09-273-14/+5