Commit Graph

2536 Commits

Author SHA1 Message Date
Rémy Coutable 6e3eec16c7 Merge branch '26890-sort-branches' into 'master'
This makes the default sort order for branches 'recently updated' rather than by name.

Closes #26890

See merge request !8666
2017-07-28 15:27:49 +00:00
Robert Speicher 64131f04e1 Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'
Prevent concurrent editing wiki

Closes #1827

See merge request !9707
2017-07-27 19:29:25 +00:00
Alexis Reigel eda001565c fetch gpg signature badges by ajax 2017-07-27 15:46:03 +02:00
Tim Zallmann 9aa2205a15 Resolve "Memory usage notice doesn't link anywhere" 2017-07-26 09:31:17 +00:00
Sean McGivern 2a067bb37c Merge branch 'backport-ee-2328' into 'master'
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328

See merge request !13022
2017-07-25 11:27:58 +00:00
Jarka Kadlecova 7bee7b848a Support both internal and external issue trackers 2017-07-24 08:13:43 +02:00
Jarka Kadlecova 2fa22a0729 Associate Issues tab only with internal issues tracker 2017-07-24 08:10:14 +02:00
Hiroyuki Sato 9b25bbc45d Merge branch 'master' into 1827-prevent-concurrent-editing-wiki
Conflicts:
	app/controllers/projects/wikis_controller.rb
	app/views/projects/wikis/edit.html.haml
	spec/features/projects/wiki/user_updates_wiki_page_spec.rb
2017-07-23 21:26:02 +09:00
Nick Thomas e4391c7190 Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 2017-07-21 18:45:12 +01:00
Z.J. van de Weg 2086483b24 Rename build to pipeline for status badges
First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This
commit is renaming files and classes from build to pipeline. Also
wording is editted to pipeline. Given `pipeline` had more characters
than `build`, I've made the field a bit wider. The width now matchers
the one for the coverage badge, so they look nice when in a table
format, or in a list.

As soon as this commit is merged to master, and released, the build.svg
is deprecated, meaning that all users which already placed a badge
should update it. However, to make sure it keeps working tests are added
for this case.
2017-07-21 10:22:09 +02:00
Alexander Randa e0ab5618a0 Wrong data type when testing webhooks 2017-07-20 15:12:06 +00:00
Felipe Artur 3715c1cfb5 Fix external issue trackers redirect 2017-07-18 11:44:47 -03:00
Filipa Lacerda 706d99aed8 Update Pipeline's badge count in Merge Request and Commits view to match real-time content 2017-07-14 15:52:54 +00:00
Grzegorz Bizon 60b91b46f2 Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes' into 'master'
Remove the rest of `trigger_schedule` related codes

Closes #32032

See merge request !12839
2017-07-14 14:02:27 +00:00
Sean McGivern 8170384d80 Revert "Merge branch 'revert-2c879643' into 'master'"
This reverts merge request !12633
2017-07-14 11:38:06 +00:00
Douwe Maan 87cb74a7bc Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set 2017-07-13 18:53:11 -07:00
Shinya Maeda b038bcf710 Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedule 2017-07-13 21:17:47 +09:00
Jacob Schatz 5f8f555a66 Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' into 'master'
Resolve "Report abusive content from an issue or merge request"

Closes #30281

See merge request !11786
2017-07-07 20:23:27 +00:00
Kamil Trzciński a77158ff31 Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master'
Add variables to pipelines schedules

Closes #32568

See merge request !12372
2017-07-07 15:17:02 +00:00
Felipe Artur b5f596c3ff Native group milestones 2017-07-07 15:08:49 +00:00
Tim Zallmann 64e589c581 Resolve "Inconsistent location of members page between groups and projects" 2017-07-07 14:40:41 +00:00
Douwe Maan 86fc4a1f3c Merge branch '34736-n-1-problem-on-milestone-page' into 'master'
N+1 problems on milestone page

Closes #34736

See merge request !12670
2017-07-07 14:37:01 +00:00
Luke "Jared" Bennett c53f2d8ebc
Revert parent param removal 2017-07-07 14:57:28 +01:00
Luke "Jared" Bennett b8deafd0d8
Removed merge_request/issue state_event param parent and removed issuable_path helpers in favour of issuable_url helpers 2017-07-07 14:57:00 +01:00
Shinya Maeda e0c150da2f Merge from master(Fix conflicts) 2017-07-07 22:33:32 +09:00
Kamil Trzcinski f108153cef Remove update|admin_pipeline_schedule from Project, and grant it in PipelineSchedule 2017-07-07 12:11:48 +02:00
Takuya Noguchi f5d960097f Avoid to repeat namespace querying on project milestone 2017-07-07 18:31:56 +09:00
Shinya Maeda 08fba1327f merge from master 2017-07-07 16:12:13 +09:00
Shinya Maeda 474d25e2e1 Use variable_params && variable_params_attributes in project variables_controller.rb 2017-07-07 15:46:23 +09:00
Shinya Maeda b7d17aab66 Use new project_variables_path in this MR 2017-07-07 15:35:12 +09:00
Shinya Maeda 8c434a52fc gb nice catches 2017-07-07 15:35:12 +09:00
Shinya Maeda 61d5b13888 Adopt project_variable_path instead of namespace_project_variable_path. (Resolve confilct from master) 2017-07-07 15:35:12 +09:00
Shinya Maeda e255e4de69 ayufan nice catches 2017-07-07 15:35:12 +09:00
Shinya Maeda 2dd9a9af2f Fix variables_controller.rb and format 2017-07-07 15:35:12 +09:00
Shinya Maeda 5b0954759c 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
2017-07-07 15:33:17 +09:00
Filipa Lacerda 03976c8f62 Re-enable polling for environments 2017-07-06 14:31:24 +01:00
Lin Jen-Shin d9435d6121 Backports for ee-2112
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
2017-07-06 16:25:03 +08:00
Grzegorz Bizon 6afe25ef33 Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'
Resolve "Project option to allow customizing CI/CD config path"

Closes #32815 and #33130

See merge request !12509
2017-07-06 07:20:36 +00:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Shinya Maeda dafc341794 Revert "Implement Ci::NestedUniquenessValidator"
This reverts commit 8f0a2b6d78.
2017-07-06 00:23:28 +09:00
Lin Jen-Shin 33a5157ad4 Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Config-Path
* upstream/master: (149 commits)
  Revert change to design. Go back to scrollable page
  Fixes the column widths for the new navigation options in settings
  Migrate #submodule_url_for to Gitaly
  Add test example for external commit status retries
  Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rb
  Fix build for !12300.
  Log rescued exceptions to Sentry
  Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths
  Revert "Merge branch 'revert-12499' into 'master'"
  Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion
  Improve the overall UX for the new monitoring dashboard
  Document that GitLab 9.3 requires the TRIGGER permission on MySQL
  Instrument Unicorn with Ruby exporter
  Remove group modal like remove project modal. Closes #33130
  Update prometheus client gem
  Enables the option in user preferences to turn on the new navigation
  Add Jasmine tests for `OAuthRememberMe`
  Simplify authentication logic in the v4 users API for !12445.
  Use stub_application_setting when testing ApplicationHelper#support_url
  wait_for_requests is not needed when AJAX is not in play
  ...
2017-07-05 22:05:39 +08:00
Lin Jen-Shin 9f5ac179d1 Rename ci_config_file to ci_config_path 2017-07-05 20:11:01 +08:00
Shinya Maeda 8f0a2b6d78 Implement Ci::NestedUniquenessValidator 2017-07-05 18:38:37 +09:00
Shinya Maeda 1bfa818a1f zj nice catchies 3 2017-07-05 18:38:35 +09:00
Shinya Maeda 5c91e10b9e zh nich catches 2 2017-07-05 18:38:28 +09:00
Shinya Maeda f433fee057 Revert extra validation for duplication between same keys on a submit 2017-07-05 18:38:27 +09:00
Shinya Maeda c5e16d524a Define authorize_update_pipeline_schedule and apply to :edit, :take_ownership, :update 2017-07-05 18:38:25 +09:00
Shinya Maeda 6e8ea52be6 Add functionality and security. 2017-07-05 18:38:25 +09:00
Shinya Maeda e364c118a0 Implement variables_attributes create/update cases 2017-07-05 18:38:10 +09:00
Shinya Maeda 507fedf3c3 Controller logic. Delete before modification. Halfway. 2017-07-05 18:37:50 +09:00