summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dispatcher-race-condition-fix' into 'master'Tim Zallmann2017-08-161-3/+3
|\ | | | | | | | | Fix race condition with dispatcher.js See merge request !13377
| * Fix race condition with dispatcher.jsdispatcher-race-condition-fixPhil Hughes2017-08-151-3/+3
| | | | | | | | The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.
* | Merge branch 'safari-fly-out-fix' into 'master'Tim Zallmann2017-08-164-526/+530
|\ \ | | | | | | | | | | | | | | | | | | Fix the fly-out menu in the sidebar not displaying in Safari Closes #36441 See merge request !13445
| * | Fix the fly-out menu in the sidebar not displaying in Safarisafari-fly-out-fixPhil Hughes2017-08-154-526/+530
| | |
* | | Many Repo FixesJacob Schatz2017-08-153-3/+9
| | |
* | | Repo Editor FixesBryce Johnson2017-08-151-1/+0
| | |
* | | Merge branch 'changes-dropdown-unclickable' into 'master'Clement Ho2017-08-152-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed changed files dropdown not being shown Closes #36479 See merge request !13554
| * | | Fixed changed files dropdown not being shownPhil Hughes2017-08-152-2/+2
| |/ / | | | | | | | | | Closes #36479
* | | Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignmentClement Ho2017-08-1511-31/+47
|\ \ \ | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/_nav_btns.html.haml
| * | | Add two more project templateszj-add-two-more-project-templatesZ.J. van de Weg2017-08-152-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too.
| * | | Display GPG status loading spinner only when Ajax request is madeWinnie Hellmann2017-08-151-1/+0
| | | |
| * | | Fix edit merge request button inconsistent letter casingClement Ho2017-08-152-2/+2
| |/ /
| * | Merge branch 'repo-fixes-e' into 'master'Jacob Schatz2017-08-141-2/+3
| |\ \ | | | | | | | | | | | | | | | | Repo fixes part E See merge request !13472
| | * | Use single js- wrapper class to show/hideEric Eastwood2017-08-141-2/+3
| | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
| * | | Merge branch ↵Clement Ho2017-08-144-26/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931
| | * | | take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdownSimon Knox2017-08-104-26/+39
| | | | |
| * | | | Merge branch '7-days-cycle-analytics' into 'master'Rémy Coutable2017-08-141-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Last 7 days` option for Cycle Analytics view Closes #36300 See merge request !13443
| | * | | | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-111-0/+3
| | | | | |
* | | | | | Fix inconsistent spacing for edit buttons on issues and merge request pageClement Ho2017-08-141-1/+1
|/ / / / /
* | | | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-142-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* | | | | fix confidential border issue as well as confidential styles leaking on new MRRegis Boudinot2017-08-111-3/+1
|/ / / /
* | | | Add option to disable project export on instanceRobin Bobbitt2017-08-113-36/+48
| | | |
* | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-113-21/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| * | | | Migrate events into a new formatYorick Peterse2017-08-103-21/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit migrates events data in such a way that push events are stored much more efficiently. This is done by creating a shadow table called "events_for_migration", and a table called "push_event_payloads" which is used for storing push data of push events. The background migration in this commit will copy events from the "events" table into the "events_for_migration" table, push events in will also have a row created in "push_event_payloads". This approach allows us to reclaim space in the next release by simply swapping the "events" and "events_for_migration" tables, then dropping the old events (now "events_for_migration") table. The new table structure is also optimised for storage space, and does not include the unused "title" column nor the "data" column (since this data is moved to "push_event_payloads"). == Newly Created Events Newly created events are inserted into both "events" and "events_for_migration", both using the exact same primary key value. The table "push_event_payloads" in turn has a foreign key to the _shadow_ table. This removes the need for recreating and validating the foreign key after swapping the tables. Since the shadow table also has a foreign key to "projects.id" we also don't have to worry about orphaned rows. This approach however does require some additional storage as we're duplicating a portion of the events data for at least 1 release. The exact amount is hard to estimate, but for GitLab.com this is expected to be between 10 and 20 GB at most. The background migration in this commit deliberately does _not_ update the "events" table as doing so would put a lot of pressure on PostgreSQL's auto vacuuming system. == Supporting Both Old And New Events Application code has also been adjusted to support push events using both the old and new data formats. This is done by creating a PushEvent class which extends the regular Event class. Using Rails' Single Table Inheritance system we can ensure the right class is used for the right data, which in this case is based on the value of `events.action`. To support displaying old and new data at the same time the PushEvent class re-defines a few methods of the Event class, falling back to their original implementations for push events in the old format. Once all existing events have been migrated the various push event related methods can be removed from the Event model, and the calls to `super` can be removed from the methods in the PushEvent model. The UI and event atom feed have also been slightly changed to better handle this new setup, fortunately only a few changes were necessary to make this work. == API Changes The API only displays push data of events in the new format. Supporting both formats in the API is a bit more difficult compared to the UI. Since the old push data was not really well documented (apart from one example that used an incorrect "action" nmae) I decided that supporting both was not worth the effort, especially since events will be migrated in a few days _and_ new events are created in the correct format.
* | | | Merge branch 'zj-ref-path-monospace' into 'master'Douwe Maan2017-08-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix 404 on jobs details page See merge request !13459
| * | | | Fix 404 on link pathzj-ref-path-monospaceZ.J. van de Weg2017-08-101-1/+1
| |/ / /
* | | | Fix minor typos in viewsMehdi Lahmam2017-08-113-4/+4
|/ / / | | | | | | | | | Closes #36317.
* | | Merge branch 'remove-affix-issuable-sidebar-new-nav' into 'master'Filipa Lacerda2017-08-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove affix plugin from issuable sidebar with new navigation See merge request !13449
| * | | Remove affix plugin from issuable sidebar with new navigationremove-affix-issuable-sidebar-new-navPhil Hughes2017-08-101-1/+1
| | | | | | | | | | | | | | | | This isn't required with the new navigation as it is always position fixed so we are just creating a scroll event listener that will never actually do anything
* | | | Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-viewPhil Hughes2017-08-092-2/+3
|/ / /
* | | Merge branch 'mr-changes-container-full-width' into 'master'Annabel Dunstone Gray2017-08-091-14/+15
|\ \ \ | | | | | | | | | | | | | | | | Fixed merge request changes sticky container not spreading full width See merge request !13386
| * | | Fixed merge request changes sticky container not spreading full widthmr-changes-container-full-widthPhil Hughes2017-08-081-14/+15
| | |/ | |/|
* | | Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-084-27/+4
|\ \ \ | | | | | | | | | | | | | | | | Remove repo editor feature flag from RC1 See merge request !13379
| * | | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flagMike Greiling2017-08-083-3/+0
| | | | | | | | | | | | | | | | This reverts commit 79f94c8d221f9391f48899808b7a36e3905dab83.
| * | | hide the feature flag for the repo editor featureMike Greiling2017-08-081-22/+0
| | | |
| * | | Revert "Combine 'turn on/off' user dropdown links into 'experimental ↵Mike Greiling2017-08-085-5/+7
| |/ / | | | | | | | | | | | | | | | features' link and andded 'experimental features' heading for user preferences page" This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686.
* | | Merge branch ↵Filipa Lacerda2017-08-081-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' Resolve "'Please select a file' when attempting to upload or replace from the UI" Closes #35052 See merge request !12863
| * | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | hide placeholder text when files have been added vertically center dropzone area content close modal after file upload succeeds
* | | | Fix bar chart does not display label at hour 0Jason Dai2017-08-081-3/+3
| |/ / |/| |
* | | Merge branch 'master' into ideMike Greiling2017-08-0720-205/+274
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * | | Show all labelsRegis Boudinot2017-08-081-2/+10
| | | |
| * | | 33874 confidential issue redesignRegis Boudinot2017-08-073-6/+13
| | | |
| * | | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-071-1/+2
| | | |
| * | | Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-074-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Remove JS flicker on page load; UI tweaks See merge request !13347
| | * | | Add class to other sidebarsAnnabel Dunstone Gray2017-08-073-3/+3
| | | | |
| | * | | Remove JS flicker on page load; UI tweaksAnnabel Dunstone Gray2017-08-071-2/+2
| | | | |
| * | | | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-071-3/+4
| | | | |
| * | | | Improve mobile sidebarAnnabel Dunstone Gray2017-08-075-12/+4
| | | | |
| * | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-072-99/+100
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| | * | | | remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-041-84/+85
| | | | | |