GitLab steht Mittwoch, den 08. Juli, zwischen 09:00 und 13:00 Uhr aufgrund von Wartungsarbeiten nicht zur Verfügung.

  1. 29 Nov, 2016 1 commit
  2. 25 Nov, 2016 10 commits
    • Grzegorz Bizon's avatar
      b8e10e32
    • Grzegorz Bizon's avatar
      Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds · 895d97af
      Grzegorz Bizon authored
      * master: (312 commits)
        Fix bad selection on dropdown menu for tags filter
        Fixed issue boards scrolling with a lot of lists & issues
        You can only assign default_branch when editing a project ...
        Don't convert data which already is the target type
        Stop supporting Google and Azure as backup strategies
        renames some of the specs and adds changelog entry
        Fixed dragging issue moving wrong issue after multiple drags of issue
        Fixed issue boards issue sorting when dragging issue into list
        Rephrase some system notes to be compatible with new system note style
        Add missing JIRA file that redirects to the new location
        Fix documentation to create the `pg_trm` extension before creating the DB
        Document that we always use `do...end` for `before` in RSpec
        Backport Note#commands_changes from EE
        Log mv_namespace parameters
        Add default_branch attr to Project API payload in docs.
        Fix title case to sentence case
        properly escape username validation error message flash
        Remove header ids from University docs
        Add missing documentation.
        Added test that checks the correct select box is there for the LFS ...
        ...
      
      Conflicts:
      	app/services/system_note_service.rb
      	spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
      	spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
      	spec/services/system_note_service_spec.rb
      895d97af
    • Kamil Trzciński's avatar
      Merge branch 'fix-cancelling-pipelines' into 'master' · afe90d52
      Kamil Trzciński authored
      Improve how we could cancel pipelines:
      
      Improve how we could cancel pipelines:
      
      * Introduce `HasStatus.cancelable` which we might be able to cancel
      * Cancel and check upon `cancelable`
      * Also cancel on `CommitStatus` rather than just `Ci::Build`
      
      Fixes #23635
      
      Fixes #17845
      
      See merge request !7508
      afe90d52
    • Fatih Acet's avatar
      Merge branch 'autocomplete-space-prefix' into 'master' · 90a3b3ab
      Fatih Acet authored
      Allow GFM autocomplete to be trigger without the preceding space
      
      ## What does this MR do?
      
      Gives the ability to GFM autocomplete to be trigger even if there is no preceding space.
      
      I've taken the regex from the at.js plugin & tweaked it to allow the leading character to be a special character.
      
      ## What are the relevant issue numbers?
      
      Closes #19975 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-07-21_at_14.41.34](/uploads/19684ba286baeedb754e7457945480a8/Screen_Shot_2016-07-21_at_14.41.34.png)![Screen_Shot_2016-07-21_at_14.41.40](/uploads/a77349bce599ae93b4bcddd355087f5c/Screen_Shot_2016-07-21_at_14.41.40.png)![Screen_Shot_2016-07-21_at_14.41.46](/uploads/c35df17b678b24b73c94b181f0784188/Screen_Shot_2016-07-21_at_14.41.46.png)
      
      See merge request !5395
      90a3b3ab
    • Fatih Acet's avatar
      Merge branch 'issue_24748' into 'master' · c17d8d55
      Fatih Acet authored
      Fix title case to sentence case in "Add Todo"
      
      ## What does this MR do?
      Implements sentence case for `Add Todo`
      
      ## Are there points in the code the reviewer needs to double check?
      I changed the images used in the file `doc/workflow/todos.md` to show the new look.
      
      ## Why was this MR needed?
      #24748 
      
      ## Screenshots (if relevant)
      Before
      ![Screen_Shot_2016-11-21_at_12.03.21_PM](/uploads/225abe2901aacccea697596853bdc52c/Screen_Shot_2016-11-21_at_12.03.21_PM.png)
      ![Screen_Shot_2016-11-21_at_11.58.17_AM](/uploads/3a5997eb6bb037f1c581d9925fa288ce/Screen_Shot_2016-11-21_at_11.58.17_AM.png)
      
      After
      ![Screen_Shot_2016-11-21_at_12.03.38_PM](/uploads/3be4d58e5adaa10fab759f8726a4d257/Screen_Shot_2016-11-21_at_12.03.38_PM.png)
      ![Screen_Shot_2016-11-21_at_11.58.37_AM](/uploads/016cdb32cb1e87e9e3cfd89309b53a4a/Screen_Shot_2016-11-21_at_11.58.37_AM.png)
      
      
      ## Does this MR meet the acceptance criteria?
      
      - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
      - [X] [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)
      - [X] Branch has no merge conflicts with `master` (if it does - rebase it please)
      - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      ## What are the relevant issue numbers?
      #24748
      
      See merge request !7724
      c17d8d55
    • Rémy Coutable's avatar
      Merge branch 'issue_24958' into 'master' · 2914fa39
      Rémy Coutable authored
      Fix bad selection on dropdown menu for tags filter
      
      Fixes #24958
      
      See merge request !7750
      2914fa39
    • Luis Alonso Chavez Armendariz's avatar
    • Robert Speicher's avatar
      Merge branch 'rephrase-system-notes' into 'master' · fe4ae12e
      Robert Speicher authored
      Rephrase some system notes to be compatible with new system note style
      
      See merge request !7692
      fe4ae12e
    • Robert Speicher's avatar
      Merge branch 'fix/invalid-storage-cleanup-affecting-test-suite' into 'master' · 40fa5604
      Robert Speicher authored
      Make test suite deterministic when storage is involved
      
      ## What does this MR do?
      
      This MR fixes our RSpec test harness because one test example could affect subsequent examples if objects created with `let` had associated files stored in `tmp/tests`.
      
      We store files using CarrierWave, but we also have some custom storage rules for CI builds. Some time ago we introduced MR that purged CarrierWave uploads after each run of entire test suite https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3435, but this is not enough, as we should isolate each test example to be able to rely on deterministic test suite.
      
      Not cleaning uploads between each test example run, makes it impossible to know if preconditions are correct before test example starts to run, therefore it makes test examples, that use storage, unreliable. This MR is an attempt to improve that.  
      
      ## What are the relevant issue numbers?
      
      Closes #24808
      
      See merge request !7695
      40fa5604
    • Robert Speicher's avatar
      Merge branch 'zj-upgrade-grape' into 'master' · 5522b9dc
      Robert Speicher authored
      Update grape-entity to 0.6.0
      
      See merge request !7491
      5522b9dc
  3. 24 Nov, 2016 29 commits