1. 19 Dec, 2016 13 commits
    • Filipa Lacerda's avatar
      Merge branch 'master' into 19703-direct-link-pipelines · 54ab4adc
      Filipa Lacerda authored
      * master: (175 commits)
        Fix typo
        Always use `fixture_file_upload` helper to upload files in tests.
        Add CHANGELOG
        Fix extra spacing in all rgba methods in status file
        Improve spacing and fixes manual status color
        Add `ci-manual` status CSS with darkest gray color
        Move admin application spinach test to rspec
        Move admin deploy keys spinach test to rspec
        Fix CI/CD statuses actions' CSS on pipeline graphs
        Fix rubocop failures
        Store mattermost_url in settings
        Improve Mattermost Session specs
        Ensure the session is destroyed
        Improve session tests
        Setup mattermost session
        Fix link from doc/development/performance.md to 'Performance Monitoring'
        Fix query in Projects::ProjectMembersController to fetch members
        Improve test for sort dropdown on members page
        Fix sort dropdown alignment
        Undo changes on members search button stylesheet
        ...
      54ab4adc
    • Lin Jen-Shin (godfat)'s avatar
      Merge branch 'fix/detailed-status-groups' into 'master' · 16f950b4
      Lin Jen-Shin (godfat) authored
      Improve icons and style for manual build status
      
      ## What does this MR do?
      
      This MR changes the CSS class for manual build status badge to make it a little more different than skipped build status badge. It makes it darker.
      
      ## Screenshots
      
      ![Screen_Shot_2016-12-17_at_13.37.58](/uploads/9628f0e84fdaad82d8833f546f0192a6/Screen_Shot_2016-12-17_at_13.37.58.png)![Screen_Shot_2016-12-17_at_13.31.48](/uploads/fe8e27df0274b9f9ae840110593a298a/Screen_Shot_2016-12-17_at_13.31.48.png)
      
      
      See merge request !8102
      16f950b4
    • Nick Thomas's avatar
      Merge branch 'jej-fix-doc-performance-link-to-monitoring' into 'master' · e33357c3
      Nick Thomas authored
      Fix link from doc/development/performance.md to 'Performance Monitoring'
      
      Another link fix!
      
      Fixes link from [doc/development/performance.md](doc/development/performance.md) to 'Gitlab Performance Monitoring'
      
      See merge request !8155
      e33357c3
    • Kamil Trzcinski's avatar
      Render stage dropdown in separate API call as HTML · 083e185c
      Kamil Trzcinski authored
      ```
      Endpoint: /group/project/pipelines/id/stage.json?stage=name
      
      Call: stage_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline, stage: stage.name)
      ```
      083e185c
    • Kamil Trzciński's avatar
      Merge branch 'improve-pipeline-fixtures' into 'master' · 028bb8fe
      Kamil Trzciński authored
      Improve pipeline fixtures
      
      ## What does this MR do?
      Adds missing fixtures to pipelines.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      To improve testability of https://gitlab.com/gitlab-org/gitlab-ce/issues/24710
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
      - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - Tests
        - [ ] Added for this feature/bug
        - [ ] All builds are passing
      - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
      - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      ## What are the relevant issue numbers?
      
      See merge request !7792
      028bb8fe
    • Grzegorz Bizon's avatar
      Merge branch 'fix/ci-readme-typo' into 'master' · a50cd9eb
      Grzegorz Bizon authored
      Fix small typo in CI readme
      
      fix typo
      
      See merge request !8167
      a50cd9eb
    • Douglas Barbosa Alexandre's avatar
      Merge branch '25301-git-2.11-force-push-bug' into 'master' · 022242c3
      Douglas Barbosa Alexandre authored
      Accept environment variables from the `pre-receive` script
      
      ## Summary
      
      1. Starting version 2.11, git changed the way the pre-receive flow works.
        - Previously, the new potential objects would be added to the main repo. If the pre-receive passes, the new objects stay in the repo but are linked up. If the pre-receive fails, the new objects stay orphaned in the repo, and are cleaned up during the next `git gc`.
        - In 2.11, the new potential objects are added to a temporary "alternate object directory", that git creates for this purpose. If the pre-receive passes, the objects from the alternate object directory are migrated to the main repo. If the pre-receive fails the alternate object directory is simply deleted.
      2. In our workflow, the pre-recieve script (in `gitlab-shell`) calls the
         `/allowed` endpoint, which calls out directly to git to perform
         various checks. These direct calls to git do _not_ have the necessary
         environment variables set which allow access to the "alternate object
         directory" (explained above). Therefore these calls to git are not able to
         access any of the new potential objects to be added during this push.
      
      3. We fix this by accepting the relevant environment variables
         (`GIT_ALTERNATE_OBJECT_DIRECTORIES`, `GIT_OBJECT_DIRECTORY`, and
         `GIT_QUARANTINE_PATH`) on the `/allowed` endpoint, and then include
         these environment variables while calling out to git.
      
      4. This commit includes these environment variables while making the "force
         push" check.
      
      ## Issue Numbers
      
      - Closes #25301 (assuming the corresponding `gitlab-shell` MR has been merged in first)
      - Corresponding `gitlab-shell` MR: gitlab-org/gitlab-shell!112
      - Corresponding EE MR: gitlab-org/gitlab-ee!964
      
      ## Tasks
      
      -  [#25301/!7967/!112] Git version 2.11.0 - Can't push to protected branch as master or developer
          - [x]  Investigate
          - [x]  Implementation
              - [x]  `force_push.rb` should use the relevant environment variables
              - [x]  Any other instances of `/allowed` calling out to git directly? 
              - [x]  Verify that the fix works over SSH as well
              - [x]  Can we trim the number of env variables? Do we need all 3?
              - [x]  Whitelist variables. Server shouldn't pass through _any_ env variable passed in
              - [x]  Any security implications?
              - [x]  Check for force push return code
              - [x]  Shouldn't be able to opt-out from the force push check by passing an env variable
          - [x]  Tests
              - [x]  CE
                  - [x]  Added
                  - [x]  Passing
              - [x]  Shell
                  - [x]  Added
                  - [x]  Passing
          - [x]  Meta
              - [x]  CHANGELOG entry created
              - [x]  Branch has no merge conflicts with `master`
              - [x]  Squashed related commits together
              - [x]  EE merge request
          - [x]  Review
              - [x]  Endboss
          - [ ]  Follow-up
              - [x]  Make sure EE is working as expected
              - [x]  [CE] Gitlab changes without gitlab-shell changes shouldn't raise any exceptions
              - [x]  [CE] Gitlab-shell changes without gitlab changes shouldn't raise any exceptions
              - [x]  [EE] Gitlab changes without gitlab-shell changes shouldn't raise any exceptions
              - [x]  [EE] Gitlab-shell changes without gitlab changes shouldn't raise any exceptions
          - [ ]  Wait for merge
              - [ ]  CE
              - [ ]  EE
              - [x]  Shell
      
      
      See merge request !7967
      022242c3
    • Rémy Coutable's avatar
      Merge branch 'dockerfile-templates' into 'master' · 2c49c1af
      Rémy Coutable authored
      Allow to use Dockerfile templates
      
      See merge request !7247
      2c49c1af
    • Rémy Coutable's avatar
      Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' · 4f77a3f8
      Rémy Coutable authored
      Move admin application spinach test to RSpec
      
      Part of #23036
      
      See merge request !8140
      4f77a3f8
    • Rémy Coutable's avatar
      Merge branch 'deploy-keys-to-rspec' into 'master' · 0b2782f2
      Rémy Coutable authored
      Move admin deploy keys spinach test to RSpec
      
      Part of #23036
      
      See merge request !8141
      0b2782f2
    • James Lopez's avatar
      Fix typo · cfd1c6a5
      James Lopez authored
      cfd1c6a5
    • Stan Hu's avatar
      Merge branch 'fix-groups-helper-spec' into 'master' · 5be894fd
      Stan Hu authored
      Always use `fixture_file_upload` helper to upload files in tests.
      
      ## What does this MR do?
      
      Fix a broken spec.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
      - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - Tests
        - [ ] Added for this feature/bug
        - [ ] All builds are passing
      - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
      - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      ## What are the relevant issue numbers?
      
      See merge request !8164
      5be894fd
    • Ruben Davila's avatar
      Always use `fixture_file_upload` helper to upload files in tests. · f8dde43d
      Ruben Davila authored
      * Also is not a good idea to use File.open without closing the file
        handler. We should use it with a block or close it explicitly.
      f8dde43d
  2. 18 Dec, 2016 6 commits
  3. 17 Dec, 2016 18 commits
  4. 16 Dec, 2016 3 commits