summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix scroll flicker34407-flickering-scroll-v1Eric Eastwood2017-06-281-3/+5
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/34407 - Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12399 - Update https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12299 throttle/debounce to happen immediately and cleanup
* Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵Robert Speicher2017-06-272-2/+2
|\ | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443
| * Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nilRuben Davila2017-06-262-2/+2
| |
* | Slightly refactor pipeline schedules form in preparation for additionsBryce Johnson2017-06-273-155/+172
| |
* | Merge branch 'dm-commit-row-browse-button' into 'master'Robert Speicher2017-06-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Adjust commit partial cache key to fix browse buttons Closes #26899 See merge request !12393
| * | Adjust commit partial cache key to fix browse buttonsDouwe Maan2017-06-221-1/+1
| | |
* | | Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter ↵Luke "Jared" Bennett2017-06-271-1/+1
| | | | | | | | | | | | submits twice and refreshes page"
* | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476
| * | | Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-271-1/+1
| | | |
* | | | Resolve "Unable to access edit comment from dropdown menu in certain screen ↵Luke "Jared" Bennett2017-06-271-1/+1
| | | | | | | | | | | | | | | | sizes"
* | | | Merge branch ↵Douwe Maan2017-06-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33442_supplement_traditional_chinese_in_hong_kong_translation_of_i18n' into 'master' Supplement Traditional Chinese in Hong Kong translation of Project Page & Repository Page Closes #33442 See merge request !11995
| * | | | Change 'Committed by' Translate黄涛2017-06-201-1/+1
| | | | |
| * | | | Translation optimization黄涛2017-06-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1. Modify the identified translations in the discussion. 2. rebase to master
| | * | | | add missing translation fields黄涛2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1. Follow up !12052 commits.
| | * | | | translation optimization in synchronous reviews黄涛2017-06-151-1/+1
| | | | | |
| | * | | | translation optimization in synchronous reviews黄涛2017-06-141-1/+1
| | | | | |
| | * | | | Optimization 'zh_HK' translation黄涛2017-06-131-1/+1
| | | | | |
| | * | | | Optimization 'zh_HK' translation黄涛2017-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | * | | | optimize translation based on comments黄涛2017-06-131-1/+1
| | | | | |
| | * | | | supplement traditional chinese in hong kong translation黄涛2017-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix #33442
| * | | | | supplement traditional chinese in hong kong translation黄涛2017-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix #33442
* | | | | | Merge branch '33561_supplement_bulgarian_translation_of_i18n' into 'master'Douwe Maan2017-06-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supplement Bulgarian translation of Project Page & Repository Page Closes #33561 See merge request !12083
| * | | | | | supplement bulgarian translation黄涛2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33561
* | | | | | | Merge branch 'issue-form-multiple-line-markdown' into 'master'Filipa Lacerda2017-06-271-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multi-line markdown in issue edit form Closes #34318 See merge request !12458
| * | | | | | | Fixed multi-line markdown in issue edit formissue-form-multiple-line-markdownPhil Hughes2017-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34318
* | | | | | | | Merge branch 'zj-review-apps-usage-data' into 'master'Grzegorz Bizon2017-06-271-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add review apps to usage ping Closes #33171 See merge request !12185
| * | | | | | | | Add in_review_folder to usage pingzj-review-apps-usage-dataZ.J. van de Weg2017-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As its hard to reliably check how many review apps there are on the clients machine, we start by checking where the type is `review`. This means the folder is called that way. This will lead to a seq scan on the table. However, this is done once a week, so the benefit of adding an index seems not to apply here.
* | | | | | | | | Action Buttons on Prio Labels working again by setting pointer events to ↵Tim Zallmann2017-06-274-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | none on…
* | | | | | | | | Merge branch 'pat-alert-when-signin-disabled' into 'master'Rémy Coutable2017-06-275-9/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide hint to create a personal access token for Git over HTTP See merge request !12105
| * | | | | | | | | Provide hint to create a personal access token for Git over HTTPRobin Bobbitt2017-06-265-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and user is not an LDAP user, present the user with an alert to create a personal access token if he does not have one already.
* | | | | | | | | | Merge branch 'fix-33991' into 'master'Sean McGivern2017-06-272-23/+31
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to subscribe to group labels on the group labels page Closes #33991 See merge request !12402
| * | | | | | | | | Fix missing hidden class when subscribed to a group labelfix-33991Douglas Barbosa Alexandre2017-06-261-3/+3
| | | | | | | | | |
| * | | | | | | | | Fix LabelsHelper#toggle_subscription_label_pathDouglas Barbosa Alexandre2017-06-261-4/+6
| | | | | | | | | |
| * | | | | | | | | Fix LabelsHelper#can_subscribe_to_label_in_different_levelsDouglas Barbosa Alexandre2017-06-261-1/+1
| | | | | | | | | |
| * | | | | | | | | Add can_subscribe_to_label_in_different_levels helper methodDouglas Barbosa Alexandre2017-06-262-12/+16
| | | | | | | | | |
| * | | | | | | | | Extract common paths to a variableDouglas Barbosa Alexandre2017-06-261-4/+5
| | | | | | | | | |
| * | | | | | | | | Allow users to subscribe to group labels on group labels pageDouglas Barbosa Alexandre2017-06-262-16/+17
| | | | | | | | | |
* | | | | | | | | | Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'Sean McGivern2017-06-271-1/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store merge request ref_fetched status in the database Closes #34052 See merge request !12424
| * | | | | | | | | | Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-databaseAdam Niedzielski2017-06-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34052
* | | | | | | | | | | Merge branch 'winh-mr-widget-no-pipeline' into 'master'Phil Hughes2017-06-271-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing pipeline in merge request widget Closes #32987 See merge request !12127
| * | | | | | | | | | | Handle missing pipeline in merge request widgetwinh2017-06-261-1/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Polish sidebar toggleClement Ho2017-06-275-3/+36
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '34309-drop-gfm-mr-ms' into 'master'Sean McGivern2017-06-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop GFM support for the title of Milestone/MergeReuqest in template Closes #34309 See merge request !12451
| * | | | | | | | | | Drop GFM support for the title of Milestone/MergeRequest in templateTakuya Noguchi2017-06-272-2/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch ↵Douwe Maan2017-06-261-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34286_add_esperanto_translations_for_cycle_analytics_and_project_and_repository_pages' into 'master' Add Esperanto translations for Cycle Analytics, Project, and Repository pages Closes #34286 See merge request !12442
| * | | | | | | | | | Add Esperanto translations for Cycle Analytics, Project, and Repository pages黄涛2017-06-261-0/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #34286
* | | | | | | | | | Merge branch 'experimental-top-nav' into 'master'Annabel Dunstone Gray2017-06-2617-8/+489
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Top navigation redesign Closes #34022, #34035, #34037, #34038, and #34021 See merge request !12214
| * | | | | | | | | | mobile spacing improvementsexperimental-top-navPhil Hughes2017-06-232-21/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed random colors left over from the original nav
| * | | | | | | | | | fixed `This project` badge background & text colorPhil Hughes2017-06-231-2/+10
| | | | | | | | | | |
| * | | | | | | | | | updates to spacing & alignmentPhil Hughes2017-06-234-18/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | combine logo & wordmark mobile improvements