summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-148-10/+78
| | | | | | | | | | 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
* Merge branch '36325-increase-z-index-pipeline-dropdown' into 'master'Phil Hughes2017-08-141-0/+1
|\ | | | | | | | | | | | | Increase z-index of pipeline dropdown Closes #36325 See merge request !13507
| * Increase z-index of pipeline dropdown36325-increase-z-index-pipeline-dropdownAnnabel Dunstone Gray2017-08-111-0/+1
| |
* | Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-1425-524/+251
|\ \ | | | | | | | | | | | | | | | | | | Don't rename system when migrating from 9.x -> 9.4 Closes #35525 and #36148 See merge request !13228
| * | Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-114-4/+184
| | | | | | | | | | | | | | | Update the markdown unconditionally since the move might have been done before, but the markdown not updated.
| * | Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-118-22/+22
| | |
| * | Update migrations to move directly into the `-/system` folderBob Van Landuyt2017-08-1111-8/+146
| | |
| * | Don't update upload paths twiceBob Van Landuyt2017-08-112-110/+0
| | | | | | | | | | | | | | | | | | This will be done in 20170717150329_enqueue_migrate_system_uploads_to_new_folder.rb instead.
| * | Don't rename the system namespaceBob Van Landuyt2017-08-113-485/+4
| | |
* | | Merge branch 'bugfix.silence-on-disabled-notifications' into 'master'Douwe Maan2017-08-148-21/+179
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bugfix.silence on disabled notifications Closes #23714 See merge request !13325
| * | | add a changelog entrybugfix.silence-on-disabled-notificationshttp://jneen.net/2017-08-111-0/+6
| | | |
| * | | switch to multi-line before blockhttp://jneen.net/2017-08-111-1/+3
| | | |
| * | | restructure the #new_key notification spechttp://jneen.net/2017-08-111-11/+6
| | | |
| * | | don't send devise notifications to the ghost userhttp://jneen.net/2017-08-111-0/+1
| | | |
| * | | reset_delivered_emails before testing #new_keyhttp://jneen.net/2017-08-111-0/+1
| | | | | | | | | | | | | | | | since the mere act of creating the key sends an email :|
| * | | skip the :read_project check for new_project_memberhttp://jneen.net/2017-08-112-2/+7
| | | | | | | | | | | | | | | | | | | | since we're just adding them as a member, the permission may still return false.
| * | | move the member spec to be with the other oneshttp://jneen.net/2017-08-111-30/+52
| | | | | | | | | | | | | | | | and add one
| * | | add a spec for new_group_memberhttp://jneen.net/2017-08-111-0/+30
| | | |
| * | | add a spec for never emailing the ghost userhttp://jneen.net/2017-08-111-0/+8
| | | |
| * | | rubocop fixhttp://jneen.net/2017-08-111-2/+1
| | | |
| * | | a membership with no user is always notifiablehttp://jneen.net/2017-08-113-6/+14
| | | | | | | | | | | | | | | | since this is for user invites and the like.
| * | | check notifiability for more emailshttp://jneen.net/2017-08-112-15/+72
| | | |
| * | | add Member#notifiable?(type, opts)http://jneen.net/2017-08-113-0/+12
| | | |
| * | | make NotificationRecipient a little more customizablehttp://jneen.net/2017-08-111-3/+15
| | | |
* | | | Merge branch 'sh-add-mysql-query-notes' into 'master'Sid Sijbrandij2017-08-121-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add notes about database performance for MySQL See merge request !13516
| * | | Add notes about database performance for MySQLStan Hu2017-08-111-0/+4
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch '36166_confi_polish_one' into 'master'Clement Ho2017-08-113-20/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix confidential border issue as well as confidential styles leaking on new MR Closes gitlab-ee#3121 See merge request !13388
| * | | | fix confidential border issue as well as confidential styles leaking on new MRRegis Boudinot2017-08-113-20/+5
|/ / / /
* | | | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-117-13/+24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Migrate force push check to Gitaly See merge request !13406
| * | | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-117-13/+24
| | | |
* | | | Merge branch 'import-project-modal-fix' into 'master'docs-group-milestonesFilipa Lacerda2017-08-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the correct import modal window not showing Closes #36318 See merge request !13490
| * | | | Fixes the correct import modal window not showingimport-project-modal-fixPhil Hughes2017-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #36318
* | | | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-1115-39/+210
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add option to disable project export on instance See merge request !13211
| * | | | | Add option to disable project export on instanceRobin Bobbitt2017-08-1113-38/+194
| | | | | |
| * | | | | Add option to disable project export on instance - db changesRobin Bobbitt2017-08-112-1/+16
| | | | | |
* | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-08-111-11/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix formatting of patch_versions.md See merge request !13503
| * | | | | | Fix formatting of patch_versions.mdJan Bruckner2017-08-111-11/+7
| | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | Merge branch 'rs-coverage-updates' into 'master'Rémy Coutable2017-08-116-26/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better categorize test coverage results See merge request !13485
| * | | | | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-116-26/+25
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Also marks a few things as uncovered, and removes an unused class.
* | | | | | | Merge branch '32004-use-timecop-safe-mode' into 'master'Robert Speicher2017-08-118-48/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Timecop safe mode Closes #32004 See merge request !13498
| * | | | | | | Enable Timecop safe mode32004-use-timecop-safe-modeRémy Coutable2017-08-118-48/+26
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'broadcast-messages-cache' into 'master'Sean McGivern2017-08-116-8/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better caching and indexing of broadcast messages Closes #31706 See merge request !13429
| * | | | | | | Better caching and indexing of broadcast messagesYorick Peterse2017-08-116-8/+80
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caching of BroadcastMessage instances has been changed so a cache stays valid as long as the default cache expiration time permits, instead of the cache being expired after 1 minute. When modifying broadcast messages the cache is flushed automatically. To remove the need for performing sequence scans on the "broadcast_messages" table we also add an index on (starts_at, ends_at, id), permitting PostgreSQL to use an index scan to get all necessary data. Finally this commit adds a few NOT NULL constraints to the table to match the Rails validations. Fixes gitlab-org/gitlab-ce#31706
* | | | | | | Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' ↵Sean McGivern2017-08-113-9/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Include the `is_admin` field in the `GET /users/:id` API when current user is an admin Closes #36213 See merge request !13501
| * | | | | | | Include the `is_admin` field in the `GET /users/:id` API when current user ↵Rémy Coutable2017-08-113-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is an admin Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'winh-git-revision-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-112-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Git revision dropdown style consistent See merge request !13116
| * | | | | | | | Make Git revision dropdown style consistentwinh-git-revision-dropdown-stylewinh2017-08-092-4/+6
| | | | | | | | |
* | | | | | | | | Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' ↵Douwe Maan2017-08-114-1/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Pending delete projects no longer return 500 error in Admins projects view Closes #35435 See merge request !13389
| * | | | | | | | | Pending delete projects no longer return 500 error in Admins projects view35435-pending-delete-project-error-in-admin-interface-fixTiago Botelho2017-08-114-1/+23
| | | | | | | | | |
* | | | | | | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-1113-106/+706
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect and keep track of flaky specs See merge request !13021
View Lorry Controller Status