summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added DIff Image Viewertz-refactored-mr-imagediffsTim Zallmann2018-06-2514-39/+177
* Update URL history state with the diff view type params.Fatih Acet2018-06-191-1/+6
* Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Fatih Acet2018-06-199-38/+43
|\
| * Fix projects/issues_controller_spec failureFelipe Artur2018-06-191-1/+1
| * Resolve backend commentsFelipe Artur2018-06-198-37/+42
* | Filter unresolvable discussions and don’t show them in Changes tab.Fatih Acet2018-06-191-8/+5
* | Don’t escape file path twice.Fatih Acet2018-06-191-1/+2
|/
* Don’t show edit button when file is deletedFatih Acet2018-06-192-0/+26
* Don’t render commit discussions on the Changes tab.Fatih Acet2018-06-191-1/+1
* Remove base version check from compare versions dropdown.Fatih Acet2018-06-181-3/+1
* Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Fatih Acet2018-06-183-16/+18
|\
| * Fix resolving/unresolving notesFelipe Artur2018-06-181-1/+1
| * Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Felipe Artur2018-06-181-1/+0
| |\
| * | Address some review commentsFelipe Artur2018-06-182-15/+17
* | | Send note_project_id if discussion is for commit.Fatih Acet2018-06-181-6/+12
| |/ |/|
* | Delete extra note_project_if param.Fatih Acet2018-06-181-1/+0
|/
* Fix noteable_discussions.vue conflictsFelipe Artur2018-06-182-3/+2
|\
| * Uncomment diff line helper to return HTML and JSON at the same time depending...Fatih Acet2018-06-182-3/+2
| * Fix 'can_resolve?' method for commit notesFelipe Artur2018-06-182-4/+4
* | Fix user_sees_notes_from_forked_project_specFelipe Artur2018-06-185-7/+10
|/
* Resolve conflict in spec/javascripts/shortcuts_issuable_spec.jsWinnie Hellmann2018-06-181-7/+1
* Resolve conflicts in app/views/projects/merge_requests/show.html.hamlWinnie Hellmann2018-06-181-42/+1
* Resolve conflict in app/assets/stylesheets/framework/blocks.scssWinnie Hellmann2018-06-181-3/+0
* Resolve conflict in app/assets/javascripts/notes/components/noteable_note.vueWinnie Hellmann2018-06-181-6/+1
* Resolve conflict in app/assets/javascripts/notes/components/noteable_discussi...Winnie Hellmann2018-06-181-5/+1
* Resolve conflicts in app/assets/javascripts/notes.jsWinnie Hellmann2018-06-181-8/+0
* Merge branch 'master' into changes_tab_vue_refactoringWinnie Hellmann2018-06-18314-1729/+2562
|\
| * Merge branch 'remove-ci_job_request_with_tags_matcher' into 'master'Stan Hu2018-06-172-7/+10
| |\
| | * Remove the ci_job_request_with_tags_matcherremove-ci_job_request_with_tags_matcherKamil Trzciński2018-06-172-7/+10
| * | Merge branch 'optimise-paused-runners' into 'master'Stan Hu2018-06-173-2/+13
| |\ \ | | |/ | |/|
| | * Optimised paused runners to not re-query every 3soptimise-paused-runnersKamil Trzciński2018-06-173-2/+13
| |/
| * Merge branch 'update-nav-theme-previews' into 'master'Dmitriy Zaporozhets2018-06-162-7/+8
| |\
| | * Harmonize theme preferences previewsupdate-nav-theme-previewsAndreas Kämmerle2018-06-162-7/+8
| * | Merge branch '47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top' into '...Annabel Gray2018-06-162-1/+2
| |\ \
| | * | Fix ci mini graph dropdown alignment and positioning47610-bs4-mini-graph-dropdown-sometimes-open-on-the-topClement Ho2018-06-152-1/+2
| * | | Merge branch '47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizes' ...Annabel Gray2018-06-161-0/+1
| |\ \ \
| | * | | Enable display static for ci job dropdowns so that they dont move when window...47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizesClement Ho2018-06-151-0/+1
| * | | | Merge branch 'remove-small-container-width' into 'master'Annabel Gray2018-06-167-10/+11
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add container width for project empty placeholderGeorge Tsiolis2018-06-151-0/+1
| | * | | Remove small container widthGeorge Tsiolis2018-06-157-10/+10
| * | | | Merge branch '47917-wiki-git-access' into 'master'Clement Ho2018-06-152-2/+1
| |\ \ \ \
| | * | | | Resolve "Wiki git clone holder and dropdown is broken"Annabel Gray2018-06-152-2/+1
| |/ / / /
| * | | | Merge branch 'enable-no-multi-assign' into 'master'Mike Greiling2018-06-1517-13/+38
| |\ \ \ \
| | * | | | Enable no-multi-assignment in JS filesgfyoung2018-06-1517-13/+38
| | | |_|/ | | |/| |
| * | | | Merge branch '45557-machine-type-help-links' into 'master'Fatih Acet2018-06-152-7/+22
| |\ \ \ \
| | * | | | Resolve "Update link in GitLab cluster setup form to say "see pricing""Taurie Davis2018-06-152-7/+22
| |/ / / /
| * | | | Merge branch '47879-misalignment-in-rows-on-comparison-page' into 'master'Annabel Gray2018-06-151-0/+4
| |\ \ \ \
| | * | | | Resolve "Misalignment in rows on comparison page"Clement Ho2018-06-151-0/+4
| |/ / / /
| * | | | Merge branch '46610-stop-horizontal-scrolling-when-clicking-on-board-issue' i...Fatih Acet2018-06-151-35/+0
| |\ \ \ \
| | * | | | Resolve "Stop horizontal scrolling when clicking on board issue"Constance Okoghenun2018-06-151-35/+0
| |/ / / /
View Lorry Controller Status