summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-1461-88/+128
| | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-143-23/+49
|\ | | | | | | | | | | | | Migrate `Git::Repository.ls_files` to Gitaly Closes gitaly#404 See merge request !13302
| * Migrate Git::Repository.ls_files to Gitalygitaly-404-commit-list-filesKim "BKC" Carlbäcker2017-08-103-23/+49
| |
* | Merge branch 'zj-patch-rails-template' into 'master'36421-clarify-git_data_dirs-documentationDouwe Maan2017-08-141-0/+0
|\ \ | | | | | | | | | | | | Update rails tempalte to not contain gitlab-test See merge request !13537
| * | Update rails tempalte to not contain gitlab-testZeger-Jan van de Weg2017-08-141-0/+0
|/ / | | | | | | [ci skip]
* | Merge branch 'pagination-projects-explore' into 'master'Douwe Maan2017-08-148-10/+78
|\ \ | | | | | | | | | | | | | | | | | | Use Prev/Next pagination for exploring projects Closes #27390 See merge request !13456
| * | 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 'revert-3c2cff0c' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'" See merge request !13533
| * | | Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'"revert-3c2cff0cMarin Jankovski2017-08-141-1/+1
| | | | | | | | | | | | This reverts merge request !13523
* | | | Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-143-11/+85
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix: Thread safe GPGME tmp directory Closes #35986 See merge request !13481
| * | | reset original directory in ensureAlexis Reigel2017-08-141-8/+4
| | | |
| * | | add changelogAlexis Reigel2017-08-141-0/+4
| | | |
| * | | use mutex for keychain interactionAlexis Reigel2017-08-142-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting of the gpg home directory is not thread safe, as the directoy gets stored on the class. if multiple threads change the directory at the same time, one of the threads will be working in the wrong directory.
| * | | store gpg return directory locallyAlexis Reigel2017-08-112-5/+31
| | | |
* | | | 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
| | | | | | | | |
View Lorry Controller Status