summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Further review changesLuke "Jared" Bennett2017-10-023-11/+10
|
* FE review changes app codeLuke "Jared" Bennett2017-10-018-24/+40
|
* Fix md-area top border-radius with issue issuable-note-warningLuke "Jared" Bennett2017-09-291-1/+2
|
* Correct disabled note form style18608-lock-issuesLuke "Jared" Bennett2017-09-273-7/+30
|
* Fix karmaLuke "Jared" Bennett2017-09-271-1/+1
|
* Fix locked and unlocked iconsLuke "Jared" Bennett2017-09-271-2/+2
|
* Fix static analysisLuke "Jared" Bennett2017-09-271-2/+0
|
* add discussion lock icon to the system_note_helperJarka Kadlecova2017-09-261-1/+3
|
* use downcase instead of underscoreJarka Kadlecova2017-09-261-1/+1
|
* add feature specs for discussion lockJarka Kadlecova2017-09-261-1/+1
|
* Disable comment form when discussion locked for userJarka Kadlecova2017-09-264-5/+26
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-25138-1267/+4709
|\ | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue
| * Removes cycle analytics service and store from global namespaceFilipa Lacerda2017-09-253-59/+49
| |
| * Merge branch '38189-fix-user-avatar-url-cdn' into 'master'Douwe Maan2017-09-252-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 ↵kushalpandya2017-09-251-9/+16
| | | | | | | | | | | | `image_tag` helper
| | * Remove unnecessary use of `gsub`kushalpandya2017-09-251-1/+1
| | |
| * | Merge branch 'improve_sorting_list' into 'master'Douwe Maan2017-09-256-188/+227
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve list of sorting options Closes #36929 See merge request gitlab-org/gitlab-ce!14320
| | * | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-236-188/+227
| | |/
| * | Merge branch 'project-page-clearer' into 'master'Filipa Lacerda2017-09-253-3/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add context tabs to dashboard/projects Closes #29045 See merge request gitlab-org/gitlab-ce!14364
| | * | simplify link_to callproject-page-clearerPhil Hughes2017-09-221-4/+2
| | | |
| | * | Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-222-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/projectsPhil Hughes2017-09-222-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 Lacerda2017-09-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fixed fly-out error if mousePos array is empty See merge request gitlab-org/gitlab-ce!14338
| | * | | spec fixesfly-out-nav-mousepos-errorPhil Hughes2017-09-221-1/+1
| | | | |
| | * | | Fixed fly-out error if mousePos array is emptyPhil Hughes2017-09-221-1/+1
| | | | |
| * | | | Merge branch '37287-remove-nav-gradient' into 'master'Phil Hughes2017-09-251-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Remove navbar gradient Closes #37287 See merge request gitlab-org/gitlab-ce!14457
| | * | | Remove navbar gradient37287-remove-nav-gradientAnnabel Dunstone Gray2017-09-221-2/+2
| | | | |
| * | | | Merge branch '38171-workaround' into 'master'Robert Speicher2017-09-221-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-workaroundAndrew Newdigate2017-09-221-1/+4
| | | |/ | | |/| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
| * | | Merge branch 'dm-group-share-lock-default-help' into 'master'Rémy Coutable2017-09-221-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-helpDouwe Maan2017-09-221-1/+1
| | | | |
| * | | | Removed old icons from project pagePhil Hughes2017-09-225-28/+2
| | |_|/ | |/| |
| * | | Merge branch 'ee-to-ce-2017-09-22' into 'master'Rémy Coutable2017-09-221-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-22Lin Jen-Shin2017-09-221-7/+8
| | | | | | | | | | | | | | | | | | | | This is aligning with EE
| * | | | Make branches page translatableWinnie Hellmann2017-09-224-66/+79
| | |_|/ | |/| |
| * | | Merge branch '38234-reserve-refs-replace' into 'master'Rémy Coutable2017-09-221-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-replaceLin Jen-Shin2017-09-221-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 Zallmann2017-09-221-4/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add i18n support to pagination widget See merge request gitlab-org/gitlab-ce!14407
| | * | | Add i18n support for pagination testkushalpandya2017-09-211-4/+6
| | | | |
| * | | | Merge branch 'emoji-dom-size' into 'master'Fatih Acet2017-09-222-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-sizeBryce Johnson2017-09-201-3/+2
| | | | |
| | * | | Reverse order in showMenuElement for readability.Bryce Johnson2017-09-201-2/+2
| | | | |
| | * | | Move display:none to emoji-menu base class.Bryce Johnson2017-09-201-4/+1
| | | | |
| | * | | Remove emoji-menu from the render tree when hidden.Bryce Johnson2017-09-192-6/+47
| | | | |
| * | | | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-2256-277/+3517
| | | | |
| * | | | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-223-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-linkClement Ho2017-09-203-6/+12
| | | | | |
| * | | | | Merge branch 'acet-fix-double-note-render' into 'master'Jacob Schatz2017-09-223-9/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429
| | * | | | | Fix rendering double note issue.Fatih Acet2017-09-223-9/+26
| | | | | | |
| * | | | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-paneFatih Acet2017-09-221-1/+3
| |/ / / / /