1. 04 Aug, 2016 1 commit
  2. 03 Aug, 2016 12 commits
    • Sean McGivern's avatar
      Mention that gitlab.rb needs to be kept · 5fedd7d1
      Sean McGivern authored
      5fedd7d1
    • Sean McGivern's avatar
      732ad2f6
    • Sean McGivern's avatar
      Give priority to environment variables · 90565b5f
      Sean McGivern authored
      If an environment variable exists for secret_key_base, use that -
      always. But don't save it to secrets.yml.
      
      Also ensure that we never write to secrets.yml if there's a non-blank
      value there.
      90565b5f
    • Sean McGivern's avatar
      Store all secret keys in secrets.yml · 379c2cbc
      Sean McGivern authored
      Move the last secret from .secret to config/secrets.yml, and delete
      .secret if it exists.
      379c2cbc
    • Sean McGivern's avatar
      Store OTP secret key in secrets.yml · 405379bb
      Sean McGivern authored
      .secret stores the secret token used for both encrypting login cookies
      and for encrypting stored OTP secrets. We can't rotate this, because
      that would invalidate all existing OTP secrets.
      
      If the secret token is present in the .secret file or an environment
      variable, save it as otp_key_base in secrets.yml. Now .secret can be
      rotated without invalidating OTP secrets.
      
      If the secret token isn't present (initial setup), then just generate a
      separate otp_key_base and save in secrets.yml.
      
      Update the docs to reflect that secrets.yml needs to be retained past
      upgrades, but .secret doesn't.
      405379bb
    • Achilleas Pipinellis's avatar
      Merge branch 'add-docker-debugging-docs' into 'master' · 1ee11136
      Achilleas Pipinellis authored
      Add advanced troubleshooting for debugging issues with the Docker registry
      
      
      
      See merge request !5615
      1ee11136
    • Achilleas Pipinellis's avatar
      Small refactor on Registry troubleshooting · c91168c0
      Achilleas Pipinellis authored
      [ci skip]
      c91168c0
    • Fatih Acet's avatar
      Merge branch 'fix-filter-input-alignment' into 'master' · 132a81f4
      Fatih Acet authored
      Fix filter input alignment
      
      ## What does this MR do?
      If you carefully observe the filter inputs on the [issues page](https://gitlab.com/gitlab-org/gitlab-ce/issues) and the [projects dashboard page](https://gitlab.com/dashboard/projects), you will notice that those input fields are actually a few pixels lower than the UI elements beside them (More so for the projects dashboard page than the issues page). This MR fixes that alignment issue so that they are aligned to the buttons on their right.
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be
      
      ## Why was this MR needed?
      Improves the existing UI
      
      ## What are the relevant issue numbers?
      Closes #20559 
      
      ## Screenshots (if relevant)
      Before
      ![Screen_Shot_2016-08-02_at_5.42.28_PM](/uploads/8530fc6c9ce20f28ae74b950bc1bd6be/Screen_Shot_2016-08-02_at_5.42.28_PM.png)
      
      After
      ![Screen_Shot_2016-08-02_at_5.49.28_PM](/uploads/ec20e68045c2190aec52e5f059d1a3bc/Screen_Shot_2016-08-02_at_5.49.28_PM.png)
      
      After (with color markings)
      ![Screen_Shot_2016-08-02_at_5.49.25_PM](/uploads/6e032b1ffb438018f6fadf294c3cebd3/Screen_Shot_2016-08-02_at_5.49.25_PM.png)
      
      Before
      ![Screen_Shot_2016-08-02_at_5.41.19_PM](/uploads/11a3c30d0290328bb3298bc392facf9f/Screen_Shot_2016-08-02_at_5.41.19_PM.png)
      
      After
      ![Screen_Shot_2016-08-02_at_5.49.47_PM](/uploads/f8e20346a19dc67cc3e54788dc0e72fb/Screen_Shot_2016-08-02_at_5.49.47_PM.png)
      
      After (with color markings)
      ![Screen_Shot_2016-08-02_at_5.49.58_PM](/uploads/1839d5681ab2f3518609004511af86a6/Screen_Shot_2016-08-02_at_5.49.58_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5633
      132a81f4
    • Achilleas Pipinellis's avatar
      Merge branch 'doc-markdown-move' into 'master' · e63729d9
      Achilleas Pipinellis authored
      Move markdown doc to the right location
      
      
      
      See merge request !5635
      e63729d9
    • Achilleas Pipinellis's avatar
      Move markdown doc to the right location · 1a9431b9
      Achilleas Pipinellis authored
      [ci skip]
      1a9431b9
    • Jacob Schatz's avatar
      Merge branch 'discussion-reply-button-performance' into 'master' · 195b20e1
      Jacob Schatz authored
      Remove delay when hitting Reply... button on page with a lot of comments
      
      Every time the "Reply..." button was hit, a new `GLForm` was instantiated (which is fine), which would then call `GitLab.GfmAutoComplete.setup()` without specifying which textarea we needed autocompletion on, which resulted in `GitLab.GfmAutoComplete.setup` iterating through every single textarea on the page. On a page with a lot of comments, where each comment would have its own textarea that will be used to edit the comment, this would take a long time and cause the whole page to hang for 2 seconds when a  "Reply..." button was clicked.
      
      See merge request !5602
      195b20e1
    • Jacob Schatz's avatar
      Merge branch 'convert-trans-bg-to-css' into 'master' · 35529007
      Jacob Schatz authored
      Convert image diff background image to CSS
      
      ## What does this MR do?
      Replaces the `trans_bg.gif` image used for image diff background image with a CSS implementation of the same background image
      
      ## Are there points in the code the reviewer needs to double check?
      None
      
      ## Why was this MR needed?
      Uses CSS to replace the use of an image so that webpage rendering is slightly improved
      
      ## What are the relevant issue numbers?
      Closes #20500 
      
      ## Screenshots (if relevant)
      Before:
      ![Screen_Shot_2016-08-01_at_12.29.10_PM](/uploads/8269877c561c29e6b0ca988079ff3fc6/Screen_Shot_2016-08-01_at_12.29.10_PM.png)
      
      After:
      ![Screen_Shot_2016-08-01_at_12.29.16_PM](/uploads/cc88848b9c0e044445d19b889fd79271/Screen_Shot_2016-08-01_at_12.29.16_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5598
      35529007
  3. 02 Aug, 2016 27 commits