summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'"revert-3c2cff0cMarin Jankovski2017-08-141-1/+1
| | | This reverts merge request !13523
* Merge branch 'fly-out-tunnel' into 'master'Filipa Lacerda2017-08-143-69/+255
|\ | | | | | | | | | | | | Add dynamic navigation tunnel to fly-out menus Closes #35949 See merge request !13315
| * moved timeout to a variablefly-out-tunnelPhil Hughes2017-08-141-4/+8
| |
| * fixed up specs caused by left over elements in the bodyPhil Hughes2017-08-142-4/+5
| |
| * fixed JS error when no sidebar existsPhil Hughes2017-08-141-0/+3
| |
| * Add dynamic navigation tunnel to fly-out menusPhil Hughes2017-08-143-69/+247
| |
* | Update CHANGELOG.md for 9.4.5James Edwards-Jones2017-08-1419-73/+21
| | | | | | [ci skip]
* | Merge branch 'zj-fix-charlock_holmes' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ | | | | | | | | | | | | Update charlock_holmes See merge request !13523
| * | Update charlock_holmeszj-fix-charlock_holmesZeger-Jan van de Weg2017-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | The compiler needs to be pinned to c++11, which is done by https://github.com/brianmario/charlock_holmes/commit/51d8a2f0eb1e9d3e476482727d4122b3d11b2bc6 Without this patch it won't install charlock_holmes on newer compilers.
* | | Merge branch ↵Tim Zallmann2017-08-141-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view' into 'master' Resolve "Project overview page doesn't load commit metadata for repo view" Closes #36133 See merge request !13362
| * \ \ Merge branch 'master' into ↵36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-viewMike Greiling2017-08-10218-778/+1763
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | '36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view' # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | fix commit metadata in project:show pageMike Greiling2017-08-081-0/+3
| | | | |
* | | | | Merge branch 'user-edit-files-spec-fix' into 'master'Tim Zallmann2017-08-141-0/+17
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Wait for requests to finish before running the ace JS Closes #36191 See merge request !13405
| * | | | Wait for requests to finish before running the ace JSuser-edit-files-spec-fixPhil Hughes2017-08-091-0/+17
| | | | | | | | | | | | | | | | | | | | Closes #36191
* | | | | 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]
View Lorry Controller Status