| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix locked state not showing upjivl-fix-locked-state | Jose | 2018-05-11 | 3 | -5/+9 |
| | | |||||
| * | Handle view type from query string. | Fatih Acet | 2018-05-11 | 1 | -1/+6 |
| | | |||||
| * | Fix spec/controllers/projects/issues_controller_spec.rb | Winnie Hellmann | 2018-05-10 | 1 | -1/+1 |
| | | |||||
| * | Fix eslint | Winnie Hellmann | 2018-05-10 | 6 | -12/+6 |
| | | |||||
| * | Merge branch 'changes_tab_vue_refactoring' of ↵ | Felipe Artur | 2018-05-10 | 5 | -6/+30 |
| |\ | | | | | | | gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring | ||||
| | * | Fix spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb | Winnie Hellmann | 2018-05-10 | 3 | -1/+9 |
| | | | |||||
| | * | Add "resolved by" to discussions | Winnie Hellmann | 2018-05-10 | 4 | -4/+20 |
| | | | |||||
| | * | Fix part of spec/features/merge_request/user_posts_notes_spec.rb | Winnie Hellmann | 2018-05-10 | 1 | -2/+2 |
| | | | |||||
| * | | Move some properties to MergeRequestUserEntity | Felipe Artur | 2018-05-10 | 4 | -25/+25 |
| |/ | |||||
| * | Fix spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb | Winnie Hellmann | 2018-05-10 | 2 | -4/+10 |
| | | |||||
| * | Fix spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb | Winnie Hellmann | 2018-05-10 | 1 | -1/+1 |
| | | |||||
| * | Fix spec/features/projects/merge_requests/user_views_diffs_spec.rb | Winnie Hellmann | 2018-05-10 | 2 | -2/+2 |
| | | |||||
| * | Fix spec/features/projects/merge_requests/user_comments_on_diff_spec.rb | Winnie Hellmann | 2018-05-10 | 12 | -13/+16 |
| | | |||||
| * | [skip ci] fix user_posts_notes_spec specs | Jose | 2018-05-09 | 1 | -7/+3 |
| | | |||||
| * | Add todo for simon | Felipe Artur | 2018-05-09 | 1 | -0/+2 |
| | | |||||
| * | Fix 500 on diff_file_entity and some feature specs | Felipe Artur | 2018-05-09 | 2 | -8/+29 |
| | | |||||
| * | Revert "Revert "Code improvements and add some properties to user entity"" | Felipe Artur | 2018-05-09 | 4 | -11/+46 |
| | | | | | This reverts commit c152e046d499676508b6d346dffcfad6c7da09b5. | ||||
| * | Fix some tests in app/assets/javascripts/diffs/components/parallel_diff_view.vue | Winnie Hellmann | 2018-05-09 | 2 | -1/+2 |
| | | |||||
| * | Merge branch 'changes_tab_vue_refactoring' of ↵ | Simon Knox | 2018-05-09 | 1 | -6/+5 |
| |\ | | | | | | | gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring | ||||
| | * | Fix some user_posts_notes_spec cases | Jose | 2018-05-08 | 1 | -1/+1 |
| | | | |||||
| | * | Fix some user_posts_notes_spec cases | Jose | 2018-05-08 | 1 | -5/+4 |
| | | | |||||
| | * | Revert "Code improvements and add some properties to user entity" | Fatih Acet | 2018-05-08 | 4 | -46/+11 |
| | | | | | | | | | This reverts commit 1c3df2cffc05118f439250ac0ebaf0fb189ef638. | ||||
| * | | correct compare versions content | Simon Knox | 2018-05-09 | 2 | -26/+23 |
| | | | |||||
| * | | partial check for show/hide compare versions section | Simon Knox | 2018-05-09 | 1 | -0/+1 |
| | | | |||||
| * | | Revert "Merge branch 'changes_tab_vue_refactoring' of ↵ | Simon Knox | 2018-05-09 | 733 | -23073/+9979 |
| | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring" This reverts commit df2813dfbe19dda506ec3fd6da11086c1440b381, reversing changes made to 2608888617f450f025158a375b887d446f92cfc0. | ||||
| * | | Merge branch 'changes_tab_vue_refactoring' of ↵ | Simon Knox | 2018-05-09 | 733 | -9979/+23073 |
| |\ \ | |/ | | | | | gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring | ||||
| | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Fatih Acet | 2018-05-08 | 727 | -9958/+23011 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | changes_tab_vue_refactoring # Conflicts: # app/serializers/merge_request_widget_entity.rb # locale/gitlab.pot | ||||
| | | * | Merge branch 'update-asset-sync' into 'master' | Robert Speicher | 2018-05-08 | 2 | -4/+4 |
| | | |\ | | | | | | | | | | | | | | | | | Update asset_sync ~> 2.2.0 to ~> 2.4 See merge request gitlab-org/gitlab-ce!18762 | ||||
| | | | * | Update asset_sync ~> 2.2.0 to ~> 2.4 | Pirate Praveen | 2018-05-05 | 2 | -4/+4 |
| | | | | | |||||
| | | * | | Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master' | Robert Speicher | 2018-05-08 | 2 | -3/+3 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Cleanly handle plural name for ghost user migration See merge request gitlab-org/gitlab-ce!18798 | ||||
| | | | * | | Cleanly handle plural name for ghost user migration | Olivier Gonzalez | 2018-05-07 | 2 | -3/+3 |
| | | | | | | |||||
| | | * | | | Merge branch 'fix/gb/add-pipeline-builds-foreign-key' into 'master' | Kamil Trzciński | 2018-05-08 | 4 | -0/+74 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add database foreign key between pipelines and builds Closes #46035 See merge request gitlab-org/gitlab-ce!18822 | ||||
| | | | * | | | Reduce scope of orphaned builds to be removed | Grzegorz Bizon | 2018-05-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | * | | | Remove orphaned builds without project / pipeline reference | Grzegorz Bizon | 2018-05-08 | 2 | -3/+8 |
| | | | | | | | |||||
| | | | * | | | Add changelog for pipeline build foreign key | Grzegorz Bizon | 2018-05-08 | 2 | -1/+5 |
| | | | | | | | |||||
| | | | * | | | Add database foreign key between pipelines and builds | Grzegorz Bizon | 2018-05-08 | 3 | -0/+65 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'dz-squash-old-migrations' into 'master' | Douwe Maan | 2018-05-08 | 86 | -1136/+335 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash migrations from 2013 See merge request gitlab-org/gitlab-ce!18547 | ||||
| | | | * | | | | Squash migrations prior to 2014-03-14 | Dmitriy Zaporozhets | 2018-04-24 | 86 | -1136/+335 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | | * | | | | | Merge branch '44319-remove-gray-buttons' into 'master' | Phil Hughes | 2018-05-08 | 5 | -17/+12 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove remaining grey buttons" Closes #44319 See merge request gitlab-org/gitlab-ce!18795 | ||||
| | | | * | | | | | Remove gray button style | Annabel Dunstone Gray | 2018-05-07 | 5 | -17/+12 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'remove-trailing-remote-mirror-todo' into 'master' | Douwe Maan | 2018-05-08 | 1 | -2/+0 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes RemoteMirror related TODO from project_spec See merge request gitlab-org/gitlab-ce!18814 | ||||
| | | | * | | | | | | Removes RemoteMirror related TODO from project_spec | Tiago Botelho | 2018-05-08 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'fix/missing-developer-process-link' into 'master' | Douwe Maan | 2018-05-08 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing security process link for developers See merge request gitlab-org/gitlab-ce!18812 | ||||
| | | | * | | | | | | | Add missing security process for developers | James Lopez | 2018-05-08 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'fix-shorcut-modal' into 'master' | Filipa Lacerda | 2018-05-08 | 2 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix modal width of shortcuts help page See merge request gitlab-org/gitlab-ce!18766 | ||||
| | | | * | | | | | | | Add changelog entry | Lars Greiss | 2018-05-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de> | ||||
| | | | * | | | | | | | Fix modal width of shorcuts help page | Lars Greiss | 2018-05-07 | 1 | -1/+1 |
| | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de> | ||||
| | | * | | | | | | | Merge branch 'ide-mr-icon-fixes' into 'master' | Filipa Lacerda | 2018-05-08 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tooltip & spacing of merge request icon in IDE Closes #46121 and #46123 See merge request gitlab-org/gitlab-ce!18805 | ||||
| | | | * | | | | | | Fixed tooltip & spacing of merge request icon in IDE | Phil Hughes | 2018-05-08 | 1 | -2/+2 |
| | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | Closes #46123, #46121 | ||||
| | | * | | | | | | Merge branch '46136-fix-dependencies' into 'master' | Phil Hughes | 2018-05-08 | 2 | -0/+16 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add sha1 dependency EE backport" Closes #46136 See merge request gitlab-org/gitlab-ce!18804 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |