diff options
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/wiki_page.rb | 10 | ||||
| -rw-r--r-- | app/views/help/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/pages.html.haml | 1 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | doc/install/installation.md | 13 | ||||
| -rw-r--r-- | doc/release/patch.md | 25 | ||||
| -rw-r--r-- | doc/release/security.md | 8 | ||||
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 6 |
11 files changed, 50 insertions, 28 deletions
diff --git a/README.md b/README.md index 7764e0a29f2..31065cf3020 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ * Manage git repositories with fine grained access controls that keep your code secure * Perform code reviews and enhance collaboration with merge requests * Each project can also have an issue tracker and a wiki -* Used by more than 50,000 organizations, GitLab is the most popular solution to manage git repositories on-premises +* Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises * Completely free and open source (MIT Expat license) * Powered by Ruby on Rails @@ -81,8 +81,12 @@ or by directly calling the script sudo /etc/init.d/gitlab start +Please login with root / 5iveL!fe + ### Run in development mode +Consider setting up the development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation). + Copy the example development unicorn configuration file cp config/unicorn.rb.example.development config/unicorn.rb @@ -96,6 +100,8 @@ or start each component separately bundle exec rails s script/background_jobs start +And surf to [localhost:3000](http://localhost:3000/) and login with root / 5iveL!fe + ### Run the tests * Run all tests diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 872b9500130..745da9c49e4 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -108,8 +108,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.check_if_can_be_merged end render json: {merge_status: @merge_request.merge_status_name} - rescue Gitlab::SatelliteNotExistError - render json: {merge_status: :no_satellite} end def automerge diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 9444d5a6b77..bcd9e0d5219 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -7,7 +7,7 @@ class Projects::WikisController < Projects::ApplicationController before_filter :load_project_wiki def pages - @wiki_pages = @project_wiki.pages + @wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]).per(30) end def show diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 4d8cfd6368f..76f311ed0b4 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -61,12 +61,16 @@ class WikiPage # The raw content of this page. def content - @attributes[:content] + @attributes[:content] ||= if @page + @page.raw_data + end end # The processed/formatted content of this page. def formatted_content - @attributes[:formatted_content] + @attributes[:formatted_content] ||= if @page + @page.formatted_data + end end # The markup format for the page. @@ -167,8 +171,6 @@ class WikiPage def set_attributes attributes[:slug] = @page.escaped_url_path attributes[:title] = @page.title - attributes[:content] = @page.raw_data - attributes[:formatted_content] = @page.formatted_data attributes[:format] = @page.format end diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 16e5948b472..724fe1d6b3a 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -12,7 +12,7 @@ %br Each project can also have an issue tracker and a wiki. %br - Used by more than 50,000 organizations, GitLab is the most popular solution to manage git repositories on-premises. + Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises. %br Read more about GitLab at #{link_to "www.gitlab.com", "https://www.gitlab.com/", target: "_blank"}. diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml index 673e3078be8..74317faf9d6 100644 --- a/app/views/projects/wikis/pages.html.haml +++ b/app/views/projects/wikis/pages.html.haml @@ -9,3 +9,4 @@ %small (#{wiki_page.format}) .pull-right %small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)} += paginate @wiki_pages, theme: 'gitlab' diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 75ee4e2c880..64fc02fe8c2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -178,6 +178,7 @@ production: &base # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations # The 'app_id' and 'app_secret' parameters are always passed as the first two # arguments, followed by optional 'args' which can be either a hash or an array. + # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html providers: # - { name: 'google_oauth2', app_id: 'YOUR APP ID', # app_secret: 'YOUR APP SECRET', diff --git a/doc/install/installation.md b/doc/install/installation.md index 6707718228e..e2b37b0788a 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -232,20 +232,21 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. ## Configure GitLab DB settings - # PostgreSQL + # PostgreSQL only: sudo -u git cp config/database.yml.postgresql config/database.yml - # Make sure to update username/password in config/database.yml. + # MySQL only: + sudo -u git cp config/database.yml.mysql config/database.yml + + # MySQL and remote PostgreSQL only: + # Update username/password in config/database.yml. # You only need to adapt the production settings (first part). # If you followed the database guide then please do as follows: # Change 'secure password' with the value you have given to $password # You can keep the double quotes around the password sudo -u git -H editor config/database.yml - or - # Mysql - sudo -u git cp config/database.yml.mysql config/database.yml - + # PostgreSQL and MySQL: # Make config/database.yml readable to git only sudo -u git -H chmod o-rwx config/database.yml diff --git a/doc/release/patch.md b/doc/release/patch.md new file mode 100644 index 00000000000..30bb39b4e49 --- /dev/null +++ b/doc/release/patch.md @@ -0,0 +1,25 @@ +# Things to do when doing a patch release +NOTE: This is a guide for GitLab developers. If you are trying to install GitLab see the latest stable [installation guide](install/installation.md) and if you are trying to upgrade, see the [upgrade guides](update). + +## When to do a patch release + +Do a patch release when there is a critical regression that needs to be adresses before the next monthly release. +Otherwise include it in the monthly release and note there was a regression fix in the release announcement. + +## Release Procedure + +1. Verify that the issue can be repoduced +1. Create an issue on private GitLab development server +1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier +1. Fix the issue on a feature branch, do this on the private GitLab development server +1. Consider creating and testing workarounds +1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch +1. In a separate commit in the stable branch, update the VERSION and CHANGELOG +1. For EE, update the CHANGELOG-EE if it is EE specific fix. Otherwise, merge the stable CE branch and add to CHANGELOG-EE "Merge community edition changes for version X.X.X" +1. Create an annotated tag vX.X.X for CE and another patch release for EE +1. Make sure that the build has passed and no tests are failing +1. Push the code and the tags to all the CE and EE repositories +1. Apply the patch to GitLab Cloud and the private GitLab development server +1. Send tweets about the release from @gitlabhq, tweet should include the most important feature that the release is addressing as well as the link to the changelog +1. Build new packages with the latest version + diff --git a/doc/release/security.md b/doc/release/security.md index 56a44b5d1da..2fe0a948ad2 100644 --- a/doc/release/security.md +++ b/doc/release/security.md @@ -13,14 +13,8 @@ Please report suspected security vulnerabilities in private to support@gitlab.co 1. Verify that the issue can be repoduced 1. Acknowledge the issue to the researcher that disclosed it -1. Fix the issue on a feature branch, do this on the private GitLab development server and update the VERSION and CHANGELOG in this branch -1. Consider creating and testing workarounds +1. Do the steps from [patch release document](doc/release/patch.md), starting with "Create an issue on private GitLab development server" 1. Create feature branches for the blog post on GitLab.com and link them from the code branch -1. Merge the code feature branch into master -1. Cherry-pick the code into the latest stable branch -1. Create an annotated tag vX.X.X for CE and another patch release for EE -1. Push the code and the tags to all the CE and EE repositories -1. Apply the patch to GitLab Cloud and the private GitLab development server 1. Merge and publish the blog posts 1. Send tweets about the release from @gitlabhq 1. Send out an email to the subscribers mailing list on MailChimp diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 8c62778d90d..c6e4d3351cf 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -1,10 +1,4 @@ module Gitlab - class SatelliteNotExistError < StandardError - def initialize(msg = "Satellite doesn't exist") - super - end - end - module Satellite class Satellite include Gitlab::Popen |