Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | spec fixhash-mr-scroll-load | Phil Hughes | 2017-09-29 | 1 | -7/+3 |
| | |||||
* | Fixed anchored content not being scrolled into view | Phil Hughes | 2017-09-29 | 1 | -0/+60 |
| | | | | | | | | Correctly scrolls anchored content into view when the user loads the page. This is most obvious when the user loads a link note in a merge request & the page does not scroll down to the note. Closes #38326 | ||||
* | Merge branch '38528-build-url' into 'master' | Phil Hughes | 2017-09-29 | 1 | -0/+14 |
|\ | | | | | | | | | | | | | Fixes data parameter not being sent in ajax request for jobs log Closes #38528 See merge request gitlab-org/gitlab-ce!14564 | ||||
| * | Fixes data parameter not being sent in ajax request for jobs log38528-build-url | Filipa Lacerda | 2017-09-28 | 1 | -0/+14 |
| | | |||||
* | | Migrate Gitlab::Git::Repository#add_tag to Gitalyfeature/migrate-repository-add-tag-to-gitaly | Ahmad Sherif | 2017-09-29 | 2 | -22/+30 |
| | | | | | | | | Closes gitaly#601 | ||||
* | | Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master' | Robert Speicher | 2017-09-28 | 3 | -11/+37 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#rm_tag to Gitaly Closes gitaly#562 See merge request gitlab-org/gitlab-ce!14388 | ||||
| * | | Migrate Git::Repository#rm_tag to Gitaly | Ahmad Sherif | 2017-09-28 | 3 | -11/+37 |
| | | | | | | | | | | | | Closes gitaly#562 | ||||
* | | | Merge branch 'acet-repo-editor-prevent-extra-request' into 'master' | Jacob Schatz | 2017-09-28 | 1 | -0/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | RepoEditor: Prevent extra network call for already opened files. Closes #38256 See merge request gitlab-org/gitlab-ce!14489 | ||||
| * | | | RepoEditor: Prevent extra network call for already opened files.acet-repo-editor-prevent-extra-request | Fatih Acet | 2017-09-27 | 1 | -0/+14 |
| | | | | |||||
* | | | | Merge branch 'fix-mr-sidebar-counter-after-merge' into 'master' | Robert Speicher | 2017-09-28 | 1 | -0/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear merge requests counter cache after merge Closes gitlab-ee#3573 and #38344 See merge request gitlab-org/gitlab-ce!14563 | ||||
| * | | | | Clear merge requests counter cache after merge | Sean McGivern | 2017-09-28 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, the MR counter in the sidebar would be wrong if an MR had been merged since the last update, but not opened or closed, as merging did not trigger a counter cache update. | ||||
* | | | | | Merge branch 'hashed-storage-migration-path' into 'master' | Douwe Maan | 2017-09-28 | 7 | -11/+303 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed storage migration path Closes gitlab-ee#3118 See merge request gitlab-org/gitlab-ce!14067 | ||||
| * | | | | | Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-path | Gabriel Mazetto | 2017-09-28 | 6 | -2/+269 |
| | | | | | | |||||
| * | | | | | [Backported from EE] Readonly flag for Projects | Gabriel Mazetto | 2017-09-28 | 2 | -10/+35 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | This is used in EE for the storage migration, and we want to use this in CE as well to be able to migrate projects to hashed_storage. | ||||
* | | | | | Support custom attributes on users | Markus Koller | 2017-09-28 | 9 | -2/+169 |
| | | | | | |||||
* | | | | | Merge branch 'jramsay-spelling-occurred' into 'master' | Jacob Schatz | 2017-09-28 | 3 | -4/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Fix spelling of occurred See merge request gitlab-org/gitlab-ce!14488 | ||||
| * | | | | Fix spelling of occurredjramsay-spelling-occurred | James Ramsay | 2017-09-26 | 3 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'dm-api-unauthorized' into 'master' | Sean McGivern | 2017-09-28 | 1 | -38/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure API responds with 401 when invalid authentication info is provided Closes #38438 See merge request gitlab-org/gitlab-ce!14525 | ||||
| * | | | | | Make sure API responds with 401 when invalid authentication info is provideddm-api-unauthorized | Douwe Maan | 2017-09-28 | 1 | -38/+40 |
| | | | | | | |||||
* | | | | | | Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' ↵ | Douwe Maan | 2017-09-28 | 1 | -0/+78 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'commit-side-by-side-comment' into 'master' | Filipa Lacerda | 2017-09-28 | 1 | -0/+36 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+36 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'refactor-services' into 'master' | Grzegorz Bizon | 2017-09-28 | 3 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor services to match EE signature See merge request gitlab-org/gitlab-ce!14385 | ||||
| * | | | | | refactor emails servicerefactor-services | James Lopez | 2017-09-28 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | refactor users update service | James Lopez | 2017-09-28 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | fix specs | James Lopez | 2017-09-28 | 3 | -6/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch '38476-improve-merge-jid-cleanup-on-merge-process' into 'master' | Sean McGivern | 2017-09-28 | 1 | -3/+20 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | 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 'acet-repo-editor-fix-link-linking' into 'master' | Jacob Schatz | 2017-09-27 | 1 | -6/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | RepoEditor: Implement line and range linking. Closes #38254 See merge request gitlab-org/gitlab-ce!14448 | ||||
| * | | | | Fix line_highlighter_spec. | Fatih Acet | 2017-09-25 | 1 | -6/+12 |
| | | | | | |||||
* | | | | | Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master' | Kamil Trzciński | 2017-09-27 | 9 | -108/+565 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Refactor a service responsible for creating a pipeline Closes #37563 and #34415 See merge request gitlab-org/gitlab-ce!14482 | ||||
| * | | | | Add test for head pipeline assignment when skipped | Grzegorz Bizon | 2017-09-26 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ce#34415 | ||||
| * | | | | Add specs for pipeline chain builder sequence class | Grzegorz Bizon | 2017-09-26 | 1 | -0/+55 |
| | | | | | |||||
| * | | | | Fix some code style offenses in pipeline chain classes | Grzegorz Bizon | 2017-09-26 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Add missing tests for pipeline chain access validator | Grzegorz Bizon | 2017-09-26 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | Add specs for pipeline builder that validates config | Grzegorz Bizon | 2017-09-26 | 1 | -0/+127 |
| | | | | | |||||
| * | | | | Add specs for pipeline builder repository validator | Grzegorz Bizon | 2017-09-26 | 1 | -0/+60 |
| | | | | | |||||
| * | | | | Add specs for builder chain that persist a pipeline | Grzegorz Bizon | 2017-09-26 | 1 | -0/+66 |
| | | | | | |||||
| * | | | | Add specs for builder chain step that skipps pipelines | Grzegorz Bizon | 2017-09-26 | 1 | -0/+85 |
| | | | | | |||||
| * | | | | Add specs for pipeline builder abilities validator | Grzegorz Bizon | 2017-09-26 | 1 | -10/+29 |
| | | | | | |||||
| * | | | | Move pipeline builder validation chain to a module | Grzegorz Bizon | 2017-09-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Split pipeline chain builder validation class | Grzegorz Bizon | 2017-09-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix code style offenses in pipeline create services | Grzegorz Bizon | 2017-09-26 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fix post receive specs regarding pipeline creation | Grzegorz Bizon | 2017-09-26 | 1 | -5/+8 |
| | | | | | |||||
| * | | | | Extract pipeline chain builder classes from service | Grzegorz Bizon | 2017-09-25 | 2 | -99/+110 |
| | | | | | |||||
| * | | | | Move related pipeline class to new pipeline module | Grzegorz Bizon | 2017-09-25 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Rémy Coutable | 2017-09-27 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci' into 'master' Fix component update with branch specifiers on CI Closes #38378 See merge request gitlab-org/gitlab-ce!14494 | ||||
| * | | | | | Fix component update with branch specifiers on CI38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci | Alejandro Rodríguez | 2017-09-26 | 1 | -0/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch ↵ | Rémy Coutable | 2017-09-27 | 1 | -0/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' find_user users helper method no longer overrides find_user API helper method. Closes #37467 See merge request gitlab-org/gitlab-ce!14418 |