1. 10 Jul, 2017 20 commits
    • Mike Greiling's avatar
    • James Edwards-Jones's avatar
      Fix conflict in >>>>>>> 9-4-stable · cb5e6fed
      James Edwards-Jones authored
      cb5e6fed
    • Mike Greiling's avatar
    • Mike Greiling's avatar
      05bea8b3
    • Mike Greiling's avatar
      Merge branch '9-4-stable' into ce-to-ee-2017-07-08 · f338f0ea
      Mike Greiling authored
      * 9-4-stable: (41 commits)
        Also inject new route helpers into includers of GitlabRoutingHelper
        Remove many N+1 queries with merge requests API
        Change `sign_out` usage to `gitlab_sign_out` in one spec
        Simplify stage_id migration as we now use relations
        Do not schedule bg migration when it is not needed
        Schedule stage_id bg migrations in batches of 10
        Use new `each_batch` helper instead of custom one
        Revert recent changes in migration helpers
        Add some comments on new migrations helpers
        Schedule stage_id background migration in ranges
        Extract `execute_in_batches` migrations helper
        Add walk_table_in_batches and refactor migration helpers
        Reduce a delay between stage_id scheduled migrations
        Improve exception description in bg migrations
        Do not override original AR5 batching interface
        Sanitize id value passed to async background migration
        Improve code examples in background migrations docs
        Add description to exception in bg migrations worker
        Do not compare float with integer in migrations specs
        Improve readability of build stage id migration query
        ...
      
      Conflicts:
      	spec/features/boards/boards_spec.rb
      	spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
      	spec/features/issues/user_uses_slash_commands_spec.rb
      	spec/features/merge_requests/edit_mr_spec.rb
      	spec/features/milestones/show_spec.rb
      	spec/features/protected_tags_spec.rb
      f338f0ea
    • Kamil Trzcinski's avatar
      Merge remote-tracking branch... · b99c7a1d
      Kamil Trzcinski authored
      Merge remote-tracking branch 'origin-ee/feature/intermediate/32568-adding-variables-to-pipelines-schedules-ee' into ce-to-ee-2017-07-08
      b99c7a1d
    • Shinya Maeda's avatar
      Port to EE · 0dc2ca3a
      Shinya Maeda authored
      0dc2ca3a
    • Kamil Trzciński's avatar
      Merge branch 'feature/intermediate/12729-group-secret-variables-ee' into 'master' · 9f2608ba
      Kamil Trzciński authored
      Port "Add Group secret variables" to EE
      
      See merge request !2373
      9f2608ba
    • Sean McGivern's avatar
      Merge branch 'slack_app_fixes' into 'master' · de3c1e45
      Sean McGivern authored
      Show Slack button when there is no team added
      
      See merge request !2381
      de3c1e45
    • Sean McGivern's avatar
      Merge branch 'gitlab_app_fixes' into 'master' · 5913a7aa
      Sean McGivern authored
      Fix GitLab Slack application configuration
      
      See merge request !2392
      5913a7aa
    • Valery Sizov's avatar
      Fix GitLab Slack application configuration · 09b90e89
      Valery Sizov authored
      09b90e89
    • Shinya Maeda's avatar
      Make the spec same with CE master · f62d940a
      Shinya Maeda authored
      f62d940a
    • Rémy Coutable's avatar
      Merge branch 'docs/exclude-gitlab-git-test-ee' into 'master' · 48cda4b3
      Rémy Coutable authored
      Exclude gitlab_git_test from docs only changes
      
      See merge request !2371
      48cda4b3
    • Douwe Maan's avatar
      Merge branch 'rs-issue-34847' into 'master' · 0c76377b
      Douwe Maan authored
      Mark a subgroup-related spec as PostgreSQL-only
      
      Closes #34847
      
      See merge request !12722
      0c76377b
    • Shinya Maeda's avatar
    • Shinya Maeda's avatar
      Fix variables_ee_spec.rb · e8322625
      Shinya Maeda authored
      e8322625
    • Shinya Maeda's avatar
      Use respond_to · 2c1cbde7
      Shinya Maeda authored
      2c1cbde7
    • Shinya Maeda's avatar
      6361e8e7
    • Shinya Maeda's avatar
      CE feature gropu-level variable · 29342210
      Shinya Maeda authored
      Basic BE change
      
      Fix static-snalysis
      
      Move the precedence of group secure variable before project secure variable. Allow project_id to be null.
      
      Separate Ci::VariableProject and Ci::VariableGroup
      
      Add the forgotton files
      
      Add migration file to update type of ci_variables
      
      Fix form_for fpr VariableProject
      
      Fix test
      
      Change the table structure according to the yorik advice
      
      Add necessary migration files. Remove unnecessary migration spec.
      
      Revert safe_model_attributes.yml
      
      Fix models
      
      Fix spec
      
      Avoid self.variable. Use becomes for correct routing.
      
      Use unique index on group_id and key
      
      Add null: false for t.timestamps
      
      Fix schema version
      
      Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable
      
      Rename the rest of them
      
      Add the rest of files
      
      Basic BE change
      
      Fix static-snalysis
      
      Move the precedence of group secure variable before project secure variable. Allow project_id to be null.
      
      Separate Ci::VariableProject and Ci::VariableGroup
      
      Add the forgotton files
      
      Add migration file to update type of ci_variables
      
      Fix form_for fpr VariableProject
      
      Fix test
      
      Change the table structure according to the yorik advice
      
      Add necessary migration files. Remove unnecessary migration spec.
      
      Revert safe_model_attributes.yml
      
      Fix models
      
      Fix spec
      
      Avoid self.variable. Use becomes for correct routing.
      
      Use unique index on group_id and key
      
      Add null: false for t.timestamps
      
      Fix schema version
      
      Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable
      
      Rename the rest of them
      
      Add the rest of files
      
      Implement CURD
      
      Rename codes related to VariableGroup and VariableProject FE part
      
      Remove unneccesary changes
      
      Make Fe code up-to-date
      
      Add protected flag to migration file
      
      Protected group variables essential package
      
      Update schema
      
      Improve doc
      
      Fix logic and spec for models
      
      Fix logic and spec for controllers
      
       Fix logic and spec for views(pre feature)
      
      Add feature spec
      
      Fixed bugs. placeholder. reveal button. doc.
      
      Add changelog
      
      Remove unnecessary comment
      
      godfat nice catches
      
      Improve secret_variables_for arctecture
      
      Fix spec
      
      Fix StaticAnlysys & path_regex spec
      
      Revert "Improve secret_variables_for arctecture"
      
      This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1.
      
      Use ayufan suggestion for secret_variables_for
      
      Use find instead of find_by
      
      Fix spec message for variable is invalid
      
      Fix spec remove variable.group_id = group.id
      
      godffat spec nitpicks
      
      Use include Gitlab::Routing.url_helpers for presenter spec
      
      Copyedit docs for group-level secret variables
      
      [ci skip]
      
      Wrap additional routes by dash(-). And remove those routes from path_regex.rb.
      
      Add dash for GROUP_ROUTES
      
      Fix variables_controller.rb and format
      
      ayufan nice catches
      
      Use ancestors for avoiding N queries
      
      Add CASE When Clause for saving order when using where IN
      
      secret_variables_for: rails readability versino
      
      Adopt project_variable_path instead of namespace_project_variable_path. (Resolve confilct from master)
      
      gb nice catches
      
      Use new project_variables_path in this MR
      
      Fix to Variable was successfully created
      
      Use variable_params && variable_params_attributes in project variables_controller.rb
      
      Name as variable_params like project variable controller
      29342210
    • Valery Sizov's avatar
  2. 09 Jul, 2017 3 commits
  3. 08 Jul, 2017 17 commits