Skip to content
Snippets Groups Projects

Close #178 Nginx conf default_host documentation

This closes #178 (closed) We're just making it clear that some nginx installs such as by default on recent Ubuntu's, the /etc/nginx/sites-enabled/default file will conflict the listen line of the gitlab nginx conf's due to the default_server directive.

changed installation.md to identify the issue to a user added notes to both nginx configs for gitlab and gitlab-ssl [ci-skip

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @Ashe-Browne Can you make it mergeable?

  • will do, sorry a little new to this, but is it just squash the commits? Any other specific fixings that i need to make to the PR?

  • username-removed-64952 Added 2 new commits:

    Added 2 new commits:

    • a9c9c8fa - adding notes to gitlab nginx conf
    • 8d3dfff5 - Merge branch 'nginx_defaulthost_documentation' of gitlab.com:Ashe-Browne/gitlab-…
  • username-removed-64952 Added 430 new commits:

    Added 430 new commits:

    • 12f86992 - Fix safari 8 ui issue
    • 1242e039 - Merge branch 'fix-safari-ui-bug' into 'master'
    • 5f15ed04 - Respect current controller scope when using search from project area
    • 300311f3 - Merge branch 'improve-search-ux' into 'master'
    • 64919745 - Disable Sidekiq arguments logging by default
    • 65320436 - Merge branch 'disable_arguments_logger' into 'master'
    • 4cbe72d7 - UI improvements mostly for mobile screens
    • 6eeaef6d - Smaller tabs for mobile view
    • f447aed2 - Merge branch 'improve-mobile-ui' into 'master'
    • 0ec46858 - Update libv8 from 3.16.14.3 to 3.16.14.7
    • 1587c36b - Merge branch 'update-libv8' into 'master'
    • 394364e4 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • e38d4acd - Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
    • 80db117a - add preliminary 7.6 upgrade guide
    • 7bf50c8e - Merge pull request #8376 from bbodenmiller/7-6-upgrade-guide
    • 10d36475 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 2f3df4cb - HipChat service: correct service name & use v2 API
    • 1353f9aa - HipChat service: support custom servers
    • d7568727 - Merge pull request #8283 from cardoe/hipchat-private-server
    • 25a566da - Remove unused password argument from notification
    • 27077ab2 - Merge branch 'remove_password_argument' into 'master'
    • 335320a2 - Formatting and sequence of contrubution paragraphs.
    • 282ca063 - Definition of done added to the docs.
    • 8f4353a1 - Fix spelling mistake, thanks Ewoud.
    • 05f40bbf - Merge branch 'definition-of-done'
    • 674cbe93 - Dont allow project creation without repository
    • a8df4ee9 - Separate web page for projects without repository
    • 9d937293 - Move projects import to separate resource. Add bare repo creation to repository controller
    • f7d8467a - Update CHANGELOG
    • 5c1496a4 - Improve project factories
    • f6562be0 - Merge branch 'sync-project-create' into 'master'
    • 824ad406 - Make clear that the upgrader script does not update gitlab-shell.
    • b08a80fd - Merge branch 'upgrader' into 'master'
    • 64ab6c9e - Add 'MemoryKiller' Sidekiq middleware
    • d336127a - Add comments to the MemoryKiller middleware
    • 27cd35de - Merge branch 'sidekiq_memory_killer' into 'master'
    • 880478b2 - Proper wiki restore. Fixes #845 (closed)
    • 28a95f12 - Merge branch 'restore_wikis' into 'master'
    • cdf55868 - Fixed an alignment issue, fixes #778 (closed)
    • c8a2d041 - Merge branch 'master' into 'master'
    • b8fcaa7f - revert using the extension of the blob to determine the syntax highlighting language
    • f4b9a65c - Merge branch 'reactivate-hljs-autodetection' into 'master'
    • 31f75603 - Update CHANGELOG
    • 191aa971 - Properly fix wiki restore.
    • 3dc986cf - Merge branch 'backup_restore' into 'master'
    • f6800356 - The blog post will trigger a mail to the list
    • 30e28a7e - Merge branch 'security-release' into 'master'
    • 06b7907c - Fix deploy keys permission check in internal api
    • 612b8806 - Fix internal API for missing project or key
    • 7ff1c0e3 - Merge branch 'fix-internal-api' into 'master'
    • f53e0fff - Show username in comment header for easier mention
    • 9ddc6cf0 - Merge branch 'username-in-comments' into 'master'
    • 86c55106 - Change twitter handle from gitlabhq -> gitlab
    • 3ae51c3c - Merge pull request #8420 from Razer6/change_twitter_handle
    • 5b92ddb8 - Mention mobile UI improvements in CHANGELOG
    • 6818c96d - Selecting a branch is dangerous now that we have rc in a branch.
    • 3e60dd7c - Change it earlier as well.
    • c431ae41 - Merge branch 'select-a-tag' into 'master'
    • b82a205b - added office analogy to help understanding of gitlab architecture
    • 8ccaee19 - replaced hotlink
    • c85d4af8 - remove unnecessarry image
    • 1d0d949e - Merge branch 'office_analogy' into 'master'
    • bc16f813 - Update time zone rake task for production. Resolves #8387
    • 5fad1325 - Merge pull request #8394 from robertd/update-time-zone-in-gitlab-yml
    • 226819c8 - add details on protected branches
    • b9cfe90b - Merge pull request #8406 from bbodenmiller/patch-4
    • 4bfa5e54 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 0d5c8500 - Formatting and sequence of contrubution paragraphs.
    • 44e53aef - start gitlab after mysql tweaks
    • 5f65310f - Merge pull request #8319 from bbodenmiller/patch-12
    • e7a3e355 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • e683d9c0 - Possibility to create Milestones or Labels when Issues are disabled
    • e4af2b3d - Merge branch 'milestones_labels' into 'master'
    • 2e0bbe68 - you have to update gitlab shell for gitlab 7.5
    • 1b34a24f - Merge branch 'shell220' into 'master'
    • 4053c055 - Add missing timestamps to the 'members' table
    • a7ddcab7 - Merge branch 'members_table_timestamps' into 'master'
    • 23ef1783 - bump gitlab_shell
    • 7fb3b908 - Bump gitlab_git with new rugged
    • 4c5cc198 - Merge branch 'bump-gitlab_git' into 'master'
    • fe46a5c0 - Start 7.6.0
    • 533f4cdf - gitlab shell works if multiple rubies installed
    • cfee95d0 - Merge pull request #8340 from cirosantilli/multi-ruby-install-v2
    • f7bf892c - Revert "gitlab shell works if multiple rubies installed"
    • 8e7fa0c2 - Use new gitlab-shell v2.3.0
    • 43512817 - Merge branch 'fix_tests' into 'master'
    • f9aead9f - Hide gpg signature on tags page from tag message
    • 0dcc9f39 - Merge branch 'hide-gpg-signature' into 'master'
    • 1016acc6 - Small improvement to /api/user/keys doc
    • fb3009de - Merge pull request #8345 from dserodio/doc-improvement
    • 291571ec - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • b34f1be4 - Increase md typography font size
    • a7260427 - Merge branch 'increase-font-size' into 'master'
    • e65866d4 - Improve dashboard page for mobile
    • 580cedd7 - Fix header and project home ui for mobile
    • 20cd7a50 - Merge branch 'improve-mobile-ui' into 'master'
    • c4fc734e - add rebuilding of authorized_keys to docs
    • a72a919a - add correct path to rebuild-keys doc
    • b036300f - Merge branch 'rebuild-keys' into 'master'
    • 7c54c63a - Add CRON=1 backup setting for quiet backups
    • 458f8c1f - Explain why we create a StringIO
    • 5f7574cf - Merge branch 'backup-cron-mode' into 'master'
    • f4038138 - More explicit wording of the documentation.
    • e0c870c0 - The release manager handles all releases
    • 4e3bf439 - Establish ownership of security releases
    • a0a3eba1 - Explicitly mention patch releases
    • 8a0abbb7 - Merge branch 'security-release-ownership' into 'master'
    • 214f6985 - Update changelog
    • 30ac909f - Merge branch 'update_changelog_' into 'master'
    • 5b5446bd - remove extra cd command
    • d9cb3ffa - Merge pull request #8316 from bbodenmiller/patch-1
    • e0467e8f - fix backup rake task
    • ee6da7ea - Merge pull request #8310 from bbodenmiller/patch-3
    • 5e9f6562 - Update CHANGELOG for 7.5
    • d55f5587 - Merge branch 'update-changelog' into 'master'
    • 9eb571f0 - Add branch controller test.
    • 334fe865 - Sanitize branch name and ref name
    • 7e3f49ba - Merge branch 'branch_name' into 'master'
    • ced24383 - Clean the string with commit author and email.
    • a69249d9 - Merge branch 'author_attributes_clean' into 'master'
    • de3bef05 - Gitlab.com uses special packages, build them first
    • e53f9b4d - Merge branch 'gitlab.com-packages' into 'master'
    • a9dc2c20 - Update gitlab_git to 7.0.0.rc11
    • 66f0c279 - Merge branch 'update-gitlab-git' into 'master'
    • c10f6180 - Run 'GC.start' after every EmailsOnPushWorker job
    • 75c3dc9e - Merge branch 'sidekiq_gc_start' into 'master'
    • 987007b8 - remove duplicate time zone entry in CHANGELOG
    • 944e2445 - Merge pull request #8312 from bbodenmiller/patch-4
    • e3746197 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • da35baed - Added update guide for updating to 7.5, and pointed installation and updates guides to new version.
    • d803f210 - Merge branch '7-5-update-doc' into 'master'
    • 722d8073 - Prevent big amount of sql queries for push service
    • 3898c8c2 - Merge branch 'performance-improvements' into 'master'
    • 1f902c24 - fixes the block_removed_ldap_users rake task
    • dfcc59a9 - Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task
    • b952b890 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 43075865 - Adds comments to commits in the API
    • 940ed58e - Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jero…
    • d584c406 - Move new blob commit message textarea below editor
    • a6f48aed - Merge pull request #7944 from cirosantilli/new-blob-commit-below
    • ccd842c3 - Prevent post-receive error when push to project with dead forks
    • 2139e351 - Refactor merge request refresh logic on push
    • 2350c11c - Merge branch 'fix-deleted-fork' into 'master'
    • 116f73b5 - Sync master branch before releasing rc
    • 9d457fa4 - Bump gitlab-shell version
    • ae841371 - Merge branch 'bump-gitlab-shell' into 'master'
    • 98db90c4 - Factor regex error messages with spec API tests
    • 1dc99b4c - Merge pull request #8251 from cirosantilli/factor-regex-message-spec
    • 383ac10c - Issue-280 Send notifications when a note is added to a commit and author is a group member
    • 95e8f979 - Merge pull request #7617 from pkill/issue-280-commit-note-notifications
    • 2148e199 - Add issue edited timestamp
    • c58edd7c - Merge branch 'add_issue_edited_timestamp' into 'master'
    • e00e67db - Drop all Postgres sequences during backup restore
    • 57471894 - Add CHANGELOG entry for sequence drop
    • 8146271d - Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup_restore_drop_sequences
    • 1a7e3476 - Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences
    • 31d9864a - Merge branch 'backup_restore_drop_sequences' into 'master'
    • 9a96a827 - Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
    • 667c0a90 - Custom git hook documentation
    • 53f05343 - Merge pull request #8276 from dblessing/docs/custom_hooks
    • 5cf6d594 - Remove the lowest memory requirement of 512MB.
    • 3bd12e99 - Merge branch 'requirements_update' into 'master'
    • 912715c3 - update changelog && bump version
    • 43fba7f0 - Add failing test that should be green after group members api get fixed
    • 995d1984 - Split group members api
    • a2dfff41 - Dont allow guests..developers to manage group members
    • 1ab1526d - Fix raw view for public snippets
    • 9de38543 - Explicitly require addressable gem feature you need. Fixes Buildbox CI integration
    • d52a5c76 - update changelog
    • 353a9875 - Add addressable explicitly to Gemfile
    • 5c74abb5 - Fixed missing end-of-code line in 7.4 upgrade doc
    • 55cf3a5b - Merge pull request #8162 from jmsche/patch-1
    • 85a9feab - Merge branch '7-4-stable' of github.com:gitlabhq/gitlabhq into 7-4-stable
    • 1aa34f14 - Merge branch '7-4-stable'
    • bc0cf745 - Make GitLab Shell upgrade a natural part of the upgrade process.
    • 868a08d1 - Merge branch 'automate-upgrader-shell-version' into 'master'
    • 280822cd - Version 7.6.0.rc1
    • 271a3520 - minor updates & formatting changes
    • 70f30abd - Merge pull request #8273 from bbodenmiller/nginx-updates
    • 6cac4e62 - Fix attachment misaligned in comment
    • 9a2afa00 - Merge branch 'fix-attachment-ui' into 'master'
    • bc403356 - Do not require immediate password reset if specifying one when seeding database.
    • 019c0f9e - Remove unnecessary lines.
    • 2bb8e93d - Merge pull request #8246 from dluchinienoc/master
    • a9fadce3 - Create dev fixture projects with fixed visibility
    • 1d337def - Merge pull request #8168 from cirosantilli/dev-fixtures-visibility
    • e3098b69 - Don't enable IPv4 only on nginx.
    • 36f9224e - Merge branch 'nginx' into 'master'
    • f36db59d - Factor GITLAB_SHELL_VERSION get method
    • 6641341b - Merge pull request #8254 from cirosantilli/factor-get-shell-version
    • 6ace931c - make repo name link to repo homepage
    • ec1b4738 - Merge pull request #8107 (closed) from bbodenmiller/patch-16
    • f10cea34 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 5136b6ae - Revert "Version 7.6.0.rc1"
    • f56541de - Revert "Create dev fixture projects with fixed visibility"
    • 88d397f4 - Instruct users to fetch merge request branch
    • 5ef19662 - Merge branch 'better-mr-instructions' into 'master'
    • d1b489e0 - Revert "Revert "Don't output to stdout from lib non-interactive methods""
    • bf8b8741 - fix system silent call
    • 08c04bc9 - Merge branch 'fix_system_call' into 'master'
    • 5a8ec1f6 - Create a failing test where commit in mr creates a mr mention note.
    • 2ee1ec43 - Do not allow cross reference note in a mr if a mr contains mentioned commit.
    • 6d775dda - Fix tests after change to regex validation message.
    • 150fc0cc - Merge branch 'master' into mentioned_inside_mr
    • f5c89b21 - Merge branch 'mentioned_inside_mr' into 'master'
    • 57c7dafb - Light gray bg for white code scheme if used in comments and wiki
    • 6f34d404 - remove auth duplication
    • c3e83d47 - Merge branch 'auth_duplication' into 'master'
    • 3246ed51 - Update GitLab CI service to work with new GitLab CI
    • 4a41d4b7 - Modify tests to match new gitlab_ci_service logic
    • 6d607627 - Merge branch 'gitlab-ci-parallel' into 'master'
    • d59f8abe - Fix tests after change to regex validation message.
    • bafd30f9 - Session API: Use case-insensitive authentication like in UI
    • e1c48f14 - Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth
    • 5cab9d6f - Merge branch 'jastkand/gitlab-ce-fix-api-auth' into 'master'
    • 7b339e61 - update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation
    • fe610ff5 - Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url
    • ef9f8677 - Expose author username in project events API
    • 9b251bd1 - Update changelog
    • d7c50b4a - Merge branch 'api-events-username' into 'master'
    • 71ed0ab0 - Fix push not allowed to protected branch if
    • 11357c8b - Merge pull request #8231 from cirosantilli/0000
    • 876c6f24 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • a56d0d47 - Remove unneeded backslash: "/" == "/"
    • 9cf50550 - Merge pull request #8241 from cirosantilli/rm-unneeded-backslash
    • 2edf212a - Expose projects_limit through users API if UserFull.
    • 24276ed8 - Merge pull request #8224 from liammonahan/master
    • 12e751a8 - Quit the database session at end of database setup
    • f8981e02 - Merge pull request #8197 from bbodenmiller/patch-14
    • 9c6106c4 - clarify that 'template1=#' is part of prompt
    • ed687976 - Merge pull request #8196 from bbodenmiller/patch-12
    • 951abce5 - Factor behaviors.scss constants
    • 0269cd3a - Merge pull request #8182 from cirosantilli/dry-css-behavior
    • 54ded5d9 - Continue strings with backslash instead of append
    • 652f4c80 - Merge pull request #8222 from cirosantilli/concat-with-backslash
    • 11848feb - Add issueable actor
    • 5c6b21f1 - Merge pull request #7967 (closed) from Bugagazavr/issue-actor
    • 6bae8c48 - Update default regex message to match regex.
    • 42a1d808 - Merge pull request #7516 from cirosantilli/update-regex-msg
    • 1072c951 - Attachment URL with non-/ relative root
    • 733012cb - Removed + '' +
    • b37b71d8 - Merge pull request #7349 from srna/patch-1
    • 100022d3 - append .xmlschema to system hook timestamp
    • c8e78d97 - Merge pull request #7495 from polamjag/fix-date-format-on-system-hook
    • 8d0bc764 - Change gitlab/log permissions in installation.md
    • 46bd0a88 - Merge pull request #7652 from m-a-r-c-o/logrotate-error-bugfix
    • 56ffa0fb - improve ssh key emails
    • 81613f96 - Merge pull request #7848 from bbodenmiller/patch-1
    • e4912243 - Transform remove blob link into button.
    • f8477287 - Merge pull request #7863 from cirosantilli/rm-blob-link-to-button
    • cb7db6d2 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 9567778f - Fix version of test seed branches.
    • 70122e46 - Merge pull request #7903 from cirosantilli/test-seed-reset
    • c3be1517 - Factor '0' * 40 blank ref constants
    • b0b234f7 - Merge pull request #8234 from cirosantilli/factor-0000
    • 0b1084a4 - Don't output to stdout from lib non-interactive methods
    • 2b00de71 - Merge pull request #8236 from cirosantilli/rm-lib-stdout
    • 884e916f - Fix doc rake import md style [ci-skip]
    • 39464667 - Merge pull request #8211 from cirosantilli/rake-import-style
    • d549a2a5 - Factor lib backend gitlab shell path
    • dae7b941 - Merge pull request #8213 from cirosantilli/factor-backend-shell-path
    • 3e55d56c - remove feature label
    • e9171fea - Merge pull request #8217 from bbodenmiller/change-label-generation
    • 76e3b8c6 - Fixed markdown error in 7.3-to-7.4 update guide
    • 4d23e840 - Merge pull request #8209 from naveda89/patch-1
    • 961a6bfc - API delete branch: render branch name json instead of true
    • 20e04d9f - Delete branch via API: doc updated
    • aa75a755 - Merge branch 'api-delete-branch-json' into 'master'
    • 3c9bf8a3 - Doc: Unicorn minimum worker_processes is 2
    • 1bfba5df - Merge pull request #8205 from CromFr/master
    • 80059cb5 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • bd0d679b - Update patch manual to link to blog post.
    • fa96b051 - Merge branch 'patch-release-tweet' into 'master'
    • 3d705131 - Added a password strength indicator
    • 91c96b37 - Added a password strength indicator
    • 10528341 - Merge branch 'master' into feature_password_strength_indicator
    • 7039c986 - Updated the IDs of the fields, so that it wouldn't mess with many tests
    • 7fbc4f5b - Corrected the layout of the strength indicator to be more consistent throughout the application.
    • 000af8d5 - Moved require from application.js to password_strength.js
    • 37f33393 - Changed colors to match GitLab's red & green and softened the yellow.
    • 9397d193 - Added ID to the form-group, to fix alignment of inputs
    • bf07fcf0 - Removed unnecessary role in form.
    • d9023da9 - Refactored password_strength configuration
    • e1299bab - Merge branch 'feature_password_strength_indicator' into 'master'
    • 6cb5d3d2 - Add addressable explicitly to Gemfile
    • d08bb4b3 - Add project name to rename repository section
    • 50ee0b81 - Leave the project name field editable, fix the test.
    • ff6b3526 - Merge branch 'project_name_and_path_rename' into 'master'
    • 9cadfc9e - Update omniauth-ldap & dependencies
    • 408bbb1b - Merge branch 'bump-ldap-lib' into 'master'
    • fd17ba9f - Mentioned users are not limited by project scope any more
    • dade6650 - Add CHANGELOG entry
    • 8388bbe8 - Merge branch 'notify-on-mention-everywhere' into 'master'
    • 822d9aa6 - Create RepoTag Grape entity and present it when doing stuff with tags via API. U…
    • c2f0ae8a - Merge pull request #7850 from asedge/api_add_tag_message
    • f0dd16d5 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 1d0f6382 - Don't update GitLab Shell to the latest version but to the corresponding version.
    • f01e311e - Merge branch 'update-gitlab-shell-to-corresponding-version' into 'master'
    • 33264523 - Refer to easyfix issues in CONTRIBUTING.md.
    • 041ffdd5 - Merge branch 'easyfix_in_contributing_md' into 'master'
    • 8431db33 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 3dbe0810 - cleanup time zone settings
    • 59c25eb2 - Merge pull request #8122 from bbodenmiller/cleanup-time-zone
    • 1f62cb3e - fix git installation
    • a2e46cf1 - Merge pull request #8191 from bbodenmiller/patch-4
    • 0084b8a7 - Display renamed files in diff views
    • 905004fd - Merge pull request #7980 (closed) from mr-vinn/diff-renames
    • 87fa3f0d - ruby -> Ruby
    • b8d85bc2 - Merge pull request #8194 from bbodenmiller/patch-9
    • 6093d4fd - fix markdown formatting
    • f99b8768 - Merge pull request #8185 from bbodenmiller/patch-3
    • c3104abf - Fix serialize migration
    • ed478105 - Merge pull request #8199 from dblessing/fix/serialize_migration
    • a1dda564 - Revert "Change update recommendation" since it should be fixed with
    • dc4caa26 - minor requirements.md cleanup
    • 7c00a841 - Merge pull request #8187 from bbodenmiller/patch-4
    • 776bca07 - Add Atlassian Bamboo service
    • 93bed443 - Merge pull request #8060 from dblessing/feature/bamboo_service
    • add5d43b - Close #717 (closed)
    • 527bbd44 - Merge branch 'master' into 'master'
    • a565c51b - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • f3c120d2 - Add failing test that should be green after group members api get fixed
    • f6491508 - Split group members api
    • eea6a8a1 - Dont allow guests..developers to manage group members
    • 4e321ec1 - Merge branch 'improve-group-members-api' into 'master'
    • fa398636 - Fix tests
    • 68b5ac7f - Add option to keep repo on project delete
    • 41518a46 - Remove :keep_repo option
    • 576a80e9 - Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce into m…
    • d0ebdedf - Merge branch 'mr-vinn/gitlab-ce-api-project-delete'
    • 93e8a056 - Only run profile js on pages that need it
    • 01441f54 - Merge pull request #8120 from cirosantilli/profile-js-only-needed
    • 8101640c - Change update recommendation
    • 45d94469 - Merge pull request #8178 from dblessing/backport/update-doc
    • 40c8f159 - Fix raw view for public snippets
    • 94d8698a - Merge branch 'fix_raw_view_snippets' into 'master'
    • 6c476a8d - Improved release documentation
    • 6e9fb7fa - Added relative dates, removed packages for GitLab.com.
    • fd44d0b6 - update release doc
    • 08d361e8 - Merge branch 'improve_release_doc' into 'master'
    • 3418f56a - Better js -> URL map to reduce unneeded execution
    • 243a74e9 - Merge pull request #8123 from cirosantilli/project-js-only-needed
    • 39c66c82 - Use Gitlab.config instead of Settings everywhere
    • f4178f96 - Merge pull request #8005 from cirosantilli/settings-to-gitlab-config
    • ab1ad3bd - Only run namespace select js when needed
    • 32a7d49a - Merge pull request #8125 from cirosantilli/namespace-select-js-only-needed
    • 2c14f9c4 - Show nothing instead of unassigned on issues
    • 367d4db4 - Merge pull request #8155 from cirosantilli/unassigned
    • 2d187976 - Run user select Js only where needed
    • 26175e44 - Merge pull request #8127 from cirosantilli/user-select-js-only-needed
    • b66a1527 - Factor abilities methods
    • beabf5db - Merge pull request #8091 (closed) from cirosantilli/factor-ability-abilities
    • 62940330 - Use button type=submit instead of input.
    • b23b78ad - Merge pull request #7866 from cirosantilli/input-button-to-tag
    • 2aa2d268 - support latest firefox esr release
    • ec4a0790 - Merge pull request #7976 (moved) from bbodenmiller/patch-9
    • 8ed7391c - Handle undefined text area values
    • 2a16bbd6 - Merge pull request #7572 from mr-vinn/application-js-fix
    • d504ca8a - Add settings to disable email sending from GitLab.
    • d78e80fa - Add email interceptor to prevent mail sending if email sending is disabled.
    • 3b6737f9 - Add interceptor test.
    • 28c08775 - Add a comment in interceptor spec.
    • eaebc20e - Merge branch 'disable_email_option' into 'master'
    • d7476123 - Failing feature for dashboard issues when user has authored issues on projects h…
    • 93532432 - Failing feature for dashboard merge requests when user has authored issues on forked project source.
    • 5e017a45 - Assigned merge request should show on dashboard mr overiew feature spec.
    • d3bdd3ba - Do not filter out issues and merge requests related to user right away.
    • 9306d8fc - Merge branch 'dashboard_issues_and_mr' into 'master'
    • c71792d9 - Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
    • 84fbd293 - transfer_service_spec: cleanup, merge common code, check against nil
    • 1ad78be9 - Merge branch 'transfer-service-spec-cleanups' into 'master'
    • d6db6dda - Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
    • ec5482a0 - Explicitly require addressable gem feature you need. Fixes Buildbox CI integration
    • ed9350dc - Merge branch 'fix-buildbox-integration' into 'master'
    • e712583a - Improved rake documentation for importing existing repositories with a rake task.
    • 19caccf7 - Added the satellites:create step, that might be necessary after the import.
    • 493d3e82 - Corrected the wording of the documentation and the layout.
    • 792f7e09 - Corrected layout, to be more friendly.
    • 5c645b76 - Fixed typo
    • 2022754d - Modified according to suggestions by @sytse
    • 5a699090 - Merge branch 'improve_rake_import_doc' into 'master'
    • ff48e1ee - Save only valid record in service migrations
    • 7371c9e2 - Merge branch 'better-service-migration' into 'master'
    • ffa58606 - Use require spec_helper instead of relative path
    • 1b140380 - Merge pull request #8223 from cirosantilli/slack-require-spec-helper
    • c49cb40f - Remove dead Event#new_branch? method
    • 5715df20 - Merge pull request #8233 from cirosantilli/rm-new-branch-dead
    • b011052c - Remove unused authenticate_user from project#show
    • f9814bf2 - Merge pull request #8094 (closed) from cirosantilli/rm-unused-authenticate_user
    • e4a38e44 - Factor using Repository#path_to_repo
    • 0ce1826b - Merge pull request #8258 from cirosantilli/factor-repo-path
    • b33d4bc2 - Revert "Don't output to stdout from lib non-interactive methods"
    • 265d624f - Merge branch 'master' into improve-white-code-highlight
    • 68850b73 - Merge branch 'improve-white-code-highlight' into 'master'
    • 9353db59 - remove unused js
    • 72922cfa - Merge branch 'remove_unused_javascript' into 'master'
    • c6bc57c1 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 07cca8cc - Use release tool for monthly releases
    • 1d1b2116 - Use release tools in patch release
    • a15dc7b8 - Add tip about EE and CE master synced before release rc1
    • 8dc9cb3d - Merge branch 'doc-release-tools' into 'master'
    • af154478 - Create emails helper for actions links.
    • 3dcb5f85 - Include the helper for mailer, add links to emails.
    • d65f2bad - Add documentation about buttons in gmail.
    • 857852ce - Set action on issue/mr creation mail.
    • 6adc313a - Merge branch 'actions_in_the_inbox' into 'master'
    • 4a5044e3 - Correctly restore empty repositories.
    • 4e65d085 - Merge pull request #8299 from dandric-activevideo/bug8271
    • c44764f5 - Prepare ForkService to support forking projects to given namespaces
    • 58011d61 - Merge branch 'prepare-fork-to-given-namespace' of https://gitlab.com/bkaindl/git
    • 18c82265 - Refactor project fork service
    • e08e405a - Select namespace where to fork project
    • d2c3c98e - Routing specs for fork projects
    • 2388fdd7 - Improve fork to namespaces feature
    • a4e98f0e - Merge branch 'fork-to-group' into 'master'
    • 53bf52f1 - Better message for failed pushes because of git hooks
    • f34d5d8a - Bump gitlab-shell
    • ef944e83 - Git hook messages: wiki access fix
    • b70cee9c - Merge branch 'git_hook_messages_ce' of dev.gitlab.org:gitlab/gitlabhq
    • 0dcc1e88 - Add Dockerfile to build an Omnibus GitLab image
    • 426a0303 - Merge branch 'master' into 'master'
    • 3a723ad2 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 8f601447 - Change avatar file size to 200kb.
    • bf393479 - Merge branch 'larger-avatar'
    • 9211b541 - Improve MR code reloading when push code
    • 835cbc06 - Reload mr code on force push too
    • c2e53438 - Merge branch 'improve-mr-reloading' into 'master'
    • c5bdc7e1 - New label/milestone link from issue form opens in new window
    • a70e7d61 - Merge branch 'improve-form-links-ux' into 'master'
    • 32c6fe53 - adding notes to gitlab nginx conf
  • IGNORE THE 430 new commits above, that branch has been removed from my pull request.this branch is force pushed as a fresh branch from master to this pull request. I've rebased against master and re-performed the edits, this is a single change pull request now. Sorry for the messy disucsison thread. @marin or @axil if you want to accept?

  • awww dangint. thanks for catching that.

  • Added 1 new commit:

  • 38 38
    39 39 ## Redirects all HTTP traffic to the HTTPS host
    40 40 server {
    41 ## Either remove "default_server" from the listen line below,
    42 ## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab
    43 ## to be served if you visit any address that your server responds to, eg.
    44 ## the ip address of the server (http://x.x.x.x/)
    41 45 listen 0.0.0.0:80;
  • username-removed-444 Status changed to merged

    Status changed to merged

  • mentioned in commit bcb07929

  • Valery Sizov mentioned in commit 8df0f692

    mentioned in commit 8df0f692

  • mentioned in commit b249d4e9

  • Valery Sizov Mentioned in commit 8df0f692

    Mentioned in commit 8df0f692

  • Please register or sign in to reply
    Loading