| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix static analysis.remove-target-dd | Jacob Schatz | 2017-09-28 | 1 | -1/+0 |
| | | |||||
| * | Fix karma test | Jacob Schatz | 2017-09-28 | 1 | -2/+0 |
| | | |||||
| * | Removes the target branch and only uses the source branch. | Jacob Schatz | 2017-09-28 | 4 | -16/+2 |
| | | |||||
| * | Remove target ref switcher. | Jacob Schatz | 2017-09-28 | 2 | -20/+0 |
| | | |||||
| * | Merge branch 'evn-add-neg-tests' into 'master' | Robert Speicher | 2017-09-28 | 1 | -0/+10 |
| |\ | | | | | | | | | | | | | Test for what should not be there as well [ci skip] See merge request gitlab-org/gitlab-ce!14492 | ||||
| | * | Test for what should not be there as wellevn-add-neg-tests | ernstvn | 2017-09-25 | 1 | -0/+10 |
| | | | |||||
| * | | Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' ↵ | Douwe Maan | 2017-09-28 | 3 | -2/+90 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "NoMethodError: undefined method `sha' for nil:NilClass" Closes #38319 See merge request gitlab-org/gitlab-ce!14547 | ||||
| | * | | Handle error when fetching ref for MR with deleted source branch38319-nomethoderror-undefined-method-sha-for-nil-nilclass | Sean McGivern | 2017-09-28 | 3 | -2/+90 |
| | | | | | | | | | | | | | | | | | | | If the ref doesn't exist, and the source branch is deleted, we can't get it back easily. Previously, we ignored this error by shelling out, so replicate that behaviour. | ||||
| * | | | Merge branch 'docs-28814-clarify-artifacts-ref' into 'master' | Grzegorz Bizon | 2017-09-28 | 2 | -1/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | Clarify artifact download via the API only accepts branch or tag name for ref See merge request gitlab-org/gitlab-ce!14545 | ||||
| | * | | | Clarify artifact download via the API only accepts branch or tag name for ref | Mark Fletcher | 2017-09-28 | 2 | -1/+6 |
| | | | | | |||||
| * | | | | Merge branch 'fix-translation-namespaces' into 'master' | Filipa Lacerda | 2017-09-28 | 3 | -9/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed missing namespaces on navigation translations See merge request gitlab-org/gitlab-ce!14472 | ||||
| | * | | | | Fixed missing namespaces on navigation translationsfix-translation-namespaces | Phil Hughes | 2017-09-27 | 3 | -9/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'mobile-images-lazy-load-check' into 'master' | Tim Zallmann | 2017-09-28 | 2 | -1/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load images in mobile sidebar & header Closes #38276 See merge request gitlab-org/gitlab-ce!14526 | ||||
| | * | | | | | karma spec fixesmobile-images-lazy-load-check | Phil Hughes | 2017-09-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Lazy load images in mobile sidebar & header | Phil Hughes | 2017-09-27 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #38276 | ||||
| * | | | | | | Merge branch 'commit-side-by-side-comment' into 'master' | Filipa Lacerda | 2017-09-28 | 3 | -3/+44 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes commit comments in parallel diff view Closes #38117 See merge request gitlab-org/gitlab-ce!14529 | ||||
| | * | | | | | Fixes commit comments in side-by-side diff viewcommit-side-by-side-comment | Phil Hughes | 2017-09-27 | 3 | -3/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by the `notes` global class not existing when the `file_comment_button` code is run. The notes class was used to check if the diff is currently in parallel view or not. To get around this I've added a check into the `file_comment_button` JS to check if the view is currently parallel or not. Closes #38117 | ||||
| * | | | | | | Merge branch 'zj-repo-gitaly' into 'master' | Sean McGivern | 2017-09-28 | 3 | -19/+18 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RepositoryExists is always called with #gitaly_migration Closes #38333 See merge request gitlab-org/gitlab-ce!14513 | ||||
| | * \ \ \ \ \ | Merge branch 'an-repo-gitaly' into 'zj-repo-gitaly'zj-repo-gitaly | Alejandro RodrÃguez | 2017-09-27 | 1 | -7/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rolling back change to n+1 detection See merge request gitlab-org/gitlab-ce!14536 | ||||
| | | * | | | | | | Rolling back change to n+1 detectionan-repo-gitaly | Andrew Newdigate | 2017-09-27 | 1 | -7/+1 |
| | |/ / / / / / | |||||
| | * | | | | | | RepositoryExists is always called with #gitaly_migration | Zeger-Jan van de Weg | 2017-09-26 | 3 | -19/+18 |
| | | | | | | | | |||||
| | * | | | | | | Don't enforce gitaly request limits for distinct calls | Alejandro RodrÃguez | 2017-09-26 | 1 | -1/+7 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge branch 'refactor-services' into 'master' | Grzegorz Bizon | 2017-09-28 | 25 | -57/+85 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor services to match EE signature See merge request gitlab-org/gitlab-ce!14385 | ||||
| | * | | | | | | refactor emails servicerefactor-services | James Lopez | 2017-09-28 | 7 | -14/+14 |
| | | | | | | | | |||||
| | * | | | | | | fix update service | James Lopez | 2017-09-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | refactor users update service | James Lopez | 2017-09-28 | 17 | -32/+32 |
| | | | | | | | | |||||
| | * | | | | | | refactor keys controller | James Lopez | 2017-09-28 | 1 | -1/+7 |
| | | | | | | | | |||||
| | * | | | | | | refactor some controllers to make them EE friendly | James Lopez | 2017-09-28 | 3 | -5/+21 |
| | | | | | | | | |||||
| | * | | | | | | fix specs | James Lopez | 2017-09-28 | 3 | -6/+6 |
| | | | | | | | | |||||
| | * | | | | | | fix users update service | James Lopez | 2017-09-28 | 1 | -3/+5 |
| | | | | | | | | |||||
| | * | | | | | | update initializers | James Lopez | 2017-09-28 | 2 | -2/+4 |
| | | | | | | | | |||||
| | * | | | | | | refactor services to match EE signature | James Lopez | 2017-09-28 | 17 | -41/+43 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '38476-improve-merge-jid-cleanup-on-merge-process' into 'master' | Sean McGivern | 2017-09-28 | 3 | -10/+37 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean merge_jid whenever necessary on the merge process Closes #38476 See merge request gitlab-org/gitlab-ce!14540 | ||||
| | * | | | | | | Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-process | Oswaldo Ferreira | 2017-09-27 | 3 | -10/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute. This way we can keep track if the MR is really "ongoing" or "stuck" | ||||
| * | | | | | | | Merge branch 'rotated_profile_image' into 'master' | Tim Zallmann | 2017-09-28 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check orientation of profile image See merge request gitlab-org/gitlab-ce!14461 | ||||
| | * | | | | | | | Check orientation of profile image | Guilherme Vieira | 2017-09-27 | 2 | -1/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'docs-38152-bump-recommended-mysql-version' into 'master' | Achilleas Pipinellis | 2017-09-28 | 2 | -2/+9 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change recommended MySQL version to 5.6 Closes #38152 See merge request gitlab-org/gitlab-ce!14546 | ||||
| | * | | | | | | | | Change recommended MySQL version to 5.6 | Mark Fletcher | 2017-09-28 | 2 | -2/+9 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'cleanup-css' into 'master'dj-test-push | Annabel Dunstone Gray | 2017-09-27 | 1 | -6/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup diff-notes-collapse css See merge request gitlab-org/gitlab-ce!14515 | ||||
| | * | | | | | | | | Cleanup diff-notes-collapse csscleanup-css | Clement Ho | 2017-09-26 | 1 | -6/+1 |
| | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'docs/k8s' into 'master' | Marcia Ramos | 2017-09-27 | 6 | -16/+92 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add things that the k8s integration enables Closes #37529 See merge request gitlab-org/gitlab-ce!14163 | ||||
| | * | | | | | | | | Add EEP to headings | Achilleas Pipinellis | 2017-09-27 | 1 | -7/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add link to NGINX Ingress and change Auto DevOps descriptiondocs/k8s | Achilleas Pipinellis | 2017-09-25 | 1 | -15/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Clean up Kubernetes integration docs page | Achilleas Pipinellis | 2017-09-25 | 6 | -7/+30 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add things that the k8s integration enables | Achilleas Pipinellis | 2017-09-25 | 1 | -2/+54 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'winh-linting-locale' into 'master' | Tim Zallmann | 2017-09-27 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linting errors in locale/index.js See merge request gitlab-org/gitlab-ce!14521 | ||||
| | * | | | | | | | | | Fix linting errors in locale/index.jswinh-linting-locale | Winnie Hellmann | 2017-09-27 | 2 | -4/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'acet-repo-editor-fix-link-linking' into 'master' | Jacob Schatz | 2017-09-27 | 4 | -152/+167 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RepoEditor: Implement line and range linking. Closes #38254 See merge request gitlab-org/gitlab-ce!14448 | ||||
| | * | | | | | | | | | | Change repo view hll color.acet-repo-editor-fix-link-linking | Fatih Acet | 2017-09-25 | 1 | -0/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix line_highlighter_spec. | Fatih Acet | 2017-09-25 | 1 | -6/+12 |
| | | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |