Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Further review changes | Luke "Jared" Bennett | 2017-10-02 | 3 | -11/+10 |
| | |||||
* | FE review changes app code | Luke "Jared" Bennett | 2017-10-01 | 8 | -24/+40 |
| | |||||
* | Fix md-area top border-radius with issue issuable-note-warning | Luke "Jared" Bennett | 2017-09-29 | 1 | -1/+2 |
| | |||||
* | Correct disabled note form style18608-lock-issues | Luke "Jared" Bennett | 2017-09-27 | 3 | -7/+30 |
| | |||||
* | Fix karma | Luke "Jared" Bennett | 2017-09-27 | 1 | -1/+1 |
| | |||||
* | Fix locked and unlocked icons | Luke "Jared" Bennett | 2017-09-27 | 1 | -2/+2 |
| | |||||
* | Fix static analysis | Luke "Jared" Bennett | 2017-09-27 | 1 | -2/+0 |
| | |||||
* | add discussion lock icon to the system_note_helper | Jarka Kadlecova | 2017-09-26 | 1 | -1/+3 |
| | |||||
* | use downcase instead of underscore | Jarka Kadlecova | 2017-09-26 | 1 | -1/+1 |
| | |||||
* | add feature specs for discussion lock | Jarka Kadlecova | 2017-09-26 | 1 | -1/+1 |
| | |||||
* | Disable comment form when discussion locked for user | Jarka Kadlecova | 2017-09-26 | 4 | -5/+26 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues | Jarka Kadlecova | 2017-09-25 | 138 | -1267/+4709 |
|\ | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue | ||||
| * | Removes cycle analytics service and store from global namespace | Filipa Lacerda | 2017-09-25 | 3 | -59/+49 |
| | | |||||
| * | Merge branch '38189-fix-user-avatar-url-cdn' into 'master' | Douwe Maan | 2017-09-25 | 2 | -10/+17 |
| |\ | | | | | | | | | | | | | | | | | | | Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437 | ||||
| | * | Add `data-src` when image is to be lazy loaded, use `tag` helper instead of ↵ | kushalpandya | 2017-09-25 | 1 | -9/+16 |
| | | | | | | | | | | | | `image_tag` helper | ||||
| | * | Remove unnecessary use of `gsub` | kushalpandya | 2017-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'improve_sorting_list' into 'master' | Douwe Maan | 2017-09-25 | 6 | -188/+227 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve list of sorting options Closes #36929 See merge request gitlab-org/gitlab-ce!14320 | ||||
| | * | | Improve list of sorting options | Vitaliy @blackst0ne Klachkov | 2017-09-23 | 6 | -188/+227 |
| | |/ | |||||
| * | | Merge branch 'project-page-clearer' into 'master' | Filipa Lacerda | 2017-09-25 | 3 | -3/+10 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add context tabs to dashboard/projects Closes #29045 See merge request gitlab-org/gitlab-ce!14364 | ||||
| | * | | simplify link_to callproject-page-clearer | Phil Hughes | 2017-09-22 | 1 | -4/+2 |
| | | | | |||||
| | * | | Fixes dashboard/projects empty state showing when viewing personal projects | Phil Hughes | 2017-09-22 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | This was caused by the `@projects` value being empty when the current user does not have any personal projects. | ||||
| | * | | Add context tabs to dashboard/projects | Phil Hughes | 2017-09-22 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to quickly switch between all projects they have access to & there own namespace projects. These tabs also keep the same filtering/search options selected so the user can quickly switch between the two different contexts. Closes #29045 | ||||
| * | | | Merge branch 'fly-out-nav-mousepos-error' into 'master' | Filipa Lacerda | 2017-09-25 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed fly-out error if mousePos array is empty See merge request gitlab-org/gitlab-ce!14338 | ||||
| | * | | | spec fixesfly-out-nav-mousepos-error | Phil Hughes | 2017-09-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixed fly-out error if mousePos array is empty | Phil Hughes | 2017-09-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch '37287-remove-nav-gradient' into 'master' | Phil Hughes | 2017-09-25 | 1 | -2/+2 |
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Remove navbar gradient Closes #37287 See merge request gitlab-org/gitlab-ce!14457 | ||||
| | * | | | Remove navbar gradient37287-remove-nav-gradient | Annabel Dunstone Gray | 2017-09-22 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch '38171-workaround' into 'master' | Robert Speicher | 2017-09-22 | 1 | -1/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Workaround for n+1 in Projects::TreeController#show Closes #38171 See merge request gitlab-org/gitlab-ce!14455 | ||||
| | * | | | Workaround for n+1 in Projects::TreeController#show38171-workaround | Andrew Newdigate | 2017-09-22 | 1 | -1/+4 |
| | | |/ | | |/| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261 | ||||
| * | | | Merge branch 'dm-group-share-lock-default-help' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inform user that current shared projects will remain shared Closes #38220 See merge request gitlab-org/gitlab-ce!14441 | ||||
| | * | | | Inform user that current shared projects will remain shareddm-group-share-lock-default-help | Douwe Maan | 2017-09-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Removed old icons from project page | Phil Hughes | 2017-09-22 | 5 | -28/+2 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'ee-to-ce-2017-09-22' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -7/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Don't show %board-add-issues-modal if there's no project See merge request gitlab-org/gitlab-ce!14442 | ||||
| | * | | | Don't show it if there's no project.ee-to-ce-2017-09-22 | Lin Jen-Shin | 2017-09-22 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | This is aligning with EE | ||||
| * | | | | Make branches page translatable | Winnie Hellmann | 2017-09-22 | 4 | -66/+79 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch '38234-reserve-refs-replace' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Reserve refs/replace because `git-replace` is using it Closes #38234 See merge request gitlab-org/gitlab-ce!14436 | ||||
| | * | | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replace | Lin Jen-Shin | 2017-09-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | See: * https://www.kernel.org/pub/software/scm/git/docs/git-replace.html * https://git-scm.com/book/en/v2/Git-Tools-Replace | ||||
| * | | | Merge branch '32782-i18n-support-pagination' into 'master' | Tim Zallmann | 2017-09-22 | 1 | -4/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add i18n support to pagination widget See merge request gitlab-org/gitlab-ce!14407 | ||||
| | * | | | Add i18n support for pagination test | kushalpandya | 2017-09-21 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | Merge branch 'emoji-dom-size' into 'master' | Fatih Acet | 2017-09-22 | 2 | -6/+43 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Improve emoji menu rendering performance Closes #36949 See merge request gitlab-org/gitlab-ce!14233 | ||||
| | * | | | Remove eslint-disable, and use arrow function.emoji-dom-size | Bryce Johnson | 2017-09-20 | 1 | -3/+2 |
| | | | | | |||||
| | * | | | Reverse order in showMenuElement for readability. | Bryce Johnson | 2017-09-20 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Move display:none to emoji-menu base class. | Bryce Johnson | 2017-09-20 | 1 | -4/+1 |
| | | | | | |||||
| | * | | | Remove emoji-menu from the render tree when hidden. | Bryce Johnson | 2017-09-19 | 2 | -6/+47 |
| | | | | | |||||
| * | | | | Resolve "Better SVG Usage in the Frontend" | Tim Zallmann | 2017-09-22 | 56 | -277/+3517 |
| | | | | | |||||
| * | | | | Merge branch 'add-view-replaced-file-link' into 'master' | Rémy Coutable | 2017-09-22 | 3 | -6/+12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394 | ||||
| | * | | | | Add view replaced file link for image diffsadd-view-replaced-file-link | Clement Ho | 2017-09-20 | 3 | -6/+12 |
| | | | | | | |||||
| * | | | | | Merge branch 'acet-fix-double-note-render' into 'master' | Jacob Schatz | 2017-09-22 | 3 | -9/+26 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429 | ||||
| | * | | | | | Fix rendering double note issue. | Fatih Acet | 2017-09-22 | 3 | -9/+26 |
| | | | | | | | |||||
| * | | | | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-pane | Fatih Acet | 2017-09-22 | 1 | -1/+3 |
| |/ / / / / |