summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix locked state not showing upjivl-fix-locked-stateJose2018-05-113-5/+9
* Handle view type from query string.Fatih Acet2018-05-111-1/+6
* Fix spec/controllers/projects/issues_controller_spec.rbWinnie Hellmann2018-05-101-1/+1
* Fix eslintWinnie Hellmann2018-05-106-12/+6
* Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Felipe Artur2018-05-105-6/+30
|\
| * Fix spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rbWinnie Hellmann2018-05-103-1/+9
| * Add "resolved by" to discussionsWinnie Hellmann2018-05-104-4/+20
| * Fix part of spec/features/merge_request/user_posts_notes_spec.rbWinnie Hellmann2018-05-101-2/+2
* | Move some properties to MergeRequestUserEntityFelipe Artur2018-05-104-25/+25
|/
* Fix spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rbWinnie Hellmann2018-05-102-4/+10
* Fix spec/features/merge_request/user_selects_branches_for_new_mr_spec.rbWinnie Hellmann2018-05-101-1/+1
* Fix spec/features/projects/merge_requests/user_views_diffs_spec.rbWinnie Hellmann2018-05-102-2/+2
* Fix spec/features/projects/merge_requests/user_comments_on_diff_spec.rbWinnie Hellmann2018-05-1012-13/+16
* [skip ci] fix user_posts_notes_spec specsJose2018-05-091-7/+3
* Add todo for simonFelipe Artur2018-05-091-0/+2
* Fix 500 on diff_file_entity and some feature specsFelipe Artur2018-05-092-8/+29
* Revert "Revert "Code improvements and add some properties to user entity""Felipe Artur2018-05-094-11/+46
* Fix some tests in app/assets/javascripts/diffs/components/parallel_diff_view.vueWinnie Hellmann2018-05-092-1/+2
* Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Simon Knox2018-05-091-6/+5
|\
| * Fix some user_posts_notes_spec casesJose2018-05-081-1/+1
| * Fix some user_posts_notes_spec casesJose2018-05-081-5/+4
| * Revert "Code improvements and add some properties to user entity"Fatih Acet2018-05-084-46/+11
* | correct compare versions contentSimon Knox2018-05-092-26/+23
* | partial check for show/hide compare versions sectionSimon Knox2018-05-091-0/+1
* | Revert "Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/g...Simon Knox2018-05-09733-23073/+9979
* | Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Simon Knox2018-05-09733-9979/+23073
|\ \ | |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue...Fatih Acet2018-05-08727-9958/+23011
| |\
| | * Merge branch 'update-asset-sync' into 'master'Robert Speicher2018-05-082-4/+4
| | |\
| | | * Update asset_sync ~> 2.2.0 to ~> 2.4Pirate Praveen2018-05-052-4/+4
| | * | Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'Robert Speicher2018-05-082-3/+3
| | |\ \
| | | * | Cleanly handle plural name for ghost user migrationOlivier Gonzalez2018-05-072-3/+3
| | * | | Merge branch 'fix/gb/add-pipeline-builds-foreign-key' into 'master'Kamil TrzciƄski2018-05-084-0/+74
| | |\ \ \
| | | * | | Reduce scope of orphaned builds to be removedGrzegorz Bizon2018-05-081-1/+1
| | | * | | Remove orphaned builds without project / pipeline referenceGrzegorz Bizon2018-05-082-3/+8
| | | * | | Add changelog for pipeline build foreign keyGrzegorz Bizon2018-05-082-1/+5
| | | * | | Add database foreign key between pipelines and buildsGrzegorz Bizon2018-05-083-0/+65
| | * | | | Merge branch 'dz-squash-old-migrations' into 'master'Douwe Maan2018-05-0886-1136/+335
| | |\ \ \ \
| | | * | | | Squash migrations prior to 2014-03-14Dmitriy Zaporozhets2018-04-2486-1136/+335
| | * | | | | Merge branch '44319-remove-gray-buttons' into 'master'Phil Hughes2018-05-085-17/+12
| | |\ \ \ \ \
| | | * | | | | Remove gray button styleAnnabel Dunstone Gray2018-05-075-17/+12
| | * | | | | | Merge branch 'remove-trailing-remote-mirror-todo' into 'master'Douwe Maan2018-05-081-2/+0
| | |\ \ \ \ \ \
| | | * | | | | | Removes RemoteMirror related TODO from project_specTiago Botelho2018-05-081-2/+0
| | * | | | | | | Merge branch 'fix/missing-developer-process-link' into 'master'Douwe Maan2018-05-081-0/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add missing security process for developersJames Lopez2018-05-081-0/+1
| | * | | | | | | | Merge branch 'fix-shorcut-modal' into 'master'Filipa Lacerda2018-05-082-1/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Add changelog entryLars Greiss2018-05-081-0/+5
| | | * | | | | | | Fix modal width of shorcuts help pageLars Greiss2018-05-071-1/+1
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merge branch 'ide-mr-icon-fixes' into 'master'Filipa Lacerda2018-05-081-2/+2
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Fixed tooltip & spacing of merge request icon in IDEPhil Hughes2018-05-081-2/+2
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge branch '46136-fix-dependencies' into 'master'Phil Hughes2018-05-082-0/+16
| | |\ \ \ \ \ \