Commit Graph

2294 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 11ff9fc6a9 Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into 'master'
Use regex to skip unnecessary reference processing in ProcessCommitWorker

Closes #28359

See merge request !10867
2017-05-08 12:54:23 +00:00
Sam Rose 1ebd9dad8e Add confirm delete protected branch modal 2017-05-08 07:41:58 +00:00
Zeger-Jan van de Weg 8df3997a92 Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
Kamil Trzciński 6ad3814e1b Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into 'master'
Check access to a branch when user triggers manual action

Closes #20261

See merge request !10494
2017-05-06 17:17:02 +00:00
Sean McGivern 143d88d5e6 Merge branch 'fix/admin-integrations' into 'master'
Fix new admin integrations not taking effect on existing project

Closes #26376

See merge request !11069
2017-05-05 22:01:43 +00:00
Sean McGivern 86e75ae092 Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable' 2017-05-05 22:00:36 +01:00
Jacob Schatz aa874a1cd6 Merge branch 'mia_backort' into 'master'
Backport of Multiple Assignees feature

See merge request !11089
2017-05-05 19:17:28 +00:00
Grzegorz Bizon fc121cca5b Do not reprocess actions when user retries pipeline
User who is not allowed to trigger manual actions should not be
allowed to reprocess / retrigger / retry these actions.
2017-05-05 19:35:32 +02:00
Valery Sizov 0b7aabe302 Multiple issue assignee: fix for CE restrictions 2017-05-05 20:07:35 +03:00
James Lopez 856a511b48 refactor code based on feedback 2017-05-05 18:57:52 +02:00
James Lopez f15466bd5b refactor code based on feedback 2017-05-05 18:18:39 +02:00
James Lopez 6ecf16b8f7 refactor code based on feedback 2017-05-05 18:01:33 +02:00
Valery Sizov 0cfe35f727 Multiple issue assignee: CE restriction for multiple assignees 2017-05-05 18:55:16 +03:00
Valery Sizov 9c0f2485b5 Multiple issue assignee: resolve conflicts after merging upstream 2017-05-05 18:22:54 +03:00
James Lopez ce418036c7 add callbacks in bulk 2017-05-05 16:16:02 +02:00
Valery Sizov 5004579b15 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip] 2017-05-05 16:59:31 +03:00
Jarka Kadlecova e4f7b87ddb Support comments for personal snippets 2017-05-05 15:45:49 +02:00
James Lopez 606584c115 bulk insert FTW - This would introduce more complexity, but should be faster 2017-05-05 14:43:22 +02:00
Valery Sizov 34be1835af [Multiple issue assignee] Fix a number of specs 2017-05-05 15:30:19 +03:00
Grzegorz Bizon 9363675380 Use update build policy instead of new play policy 2017-05-05 12:25:24 +02:00
Grzegorz Bizon b6facd8313 Merge commit '3a2b60f7' from 'master'
* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits)
  Fixed Karma spec
  Reject EE reserved namespace paths in CE as well
  Updated webpack config
  Include the bundler:audit job into the static-analysis job
  Document serializers
  Add artifact file page that uses the blob viewer
  Pipeline table mini graph dropdown remains open when table is refreshed
  Adds off for event hub
  Compile gitlab-shell go executables
  Allow to create new branch and empty WIP merge request from issue page
  Moved to a view spec
  Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md
  Convert seconds to minutes and hours on chat notifations
  Disable navigation to Pages config if Pages is disabled
  Sort the network graph both by commit date and topographically.
  Add tooltips to note action buttons
  Add breadcrumb, build header and pipelines submenu to artifacts browser
  Update todos screenshots
  removes the possibility of commit messages having carriage returns
  Handle incoming emails from aliases correctly
  ...
2017-05-05 12:22:46 +02:00
James Lopez 9ec39568c5 use select_values 2017-05-05 10:51:25 +02:00
James Lopez adcff298f8 fixed all issues - not doing bulk create. 2017-05-05 10:43:56 +02:00
James Lopez 1fe8b7f646 refactor propagate service to use batch inserts and subquery instead of left join 2017-05-05 09:40:44 +02:00
James Edwards-Jones 020295fffc Use regex to skip unnecessary reference processing in ProcessCommitWorker 2017-05-04 20:03:46 +01:00
Valery Sizov fc464f1ff2 Multiple issue assignee: fixed services/issues/update_service by using new NoteSummary 2017-05-04 20:22:03 +03:00
Valery Sizov 0f2a9681a3 [Multiple issue assignees] Resolving conflicts 2017-05-04 20:00:33 +03:00
James Lopez cf002738e7 refactor a few things based on feedback 2017-05-04 18:11:28 +02:00
Rares Sfirlogea 45e4c66565 Display slash commands outcome when previewing Markdown
Remove slash commands from Markdown preview and display their outcome next to
the text field.
Introduce new "explanation" block to our slash commands DSL.
Introduce optional "parse_params" block to slash commands DSL that allows to
process a parameter before it is passed to "explanation" or "command" blocks.
Pass path for previewing Markdown as "data" attribute instead of setting
a variable on "window".
2017-05-04 17:02:25 +02:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Sean McGivern ba608dc0f2 Merge branch '12910-uploader-pers-snippet' into 'master'
Prepare uploaders for personal snippets comments

See merge request !11022
2017-05-04 10:47:10 +00:00
James Lopez f81cf84035 refactor worker into service 2017-05-04 12:13:33 +02:00
Alfredo Sumaran b64a37c4ed Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +00:00
blackst0ne 62be3355b1 Add alias_attributes for notes 2017-05-04 12:58:41 +11:00
blackst0ne 35160a97f2 Add specs for issue and note changes 2017-05-04 12:58:41 +11:00
blackst0ne d9f48e45a1 Prefer single quotes 2017-05-04 12:58:41 +11:00
blackst0ne 571c832d31 Simplified assign_attributes for issuable 2017-05-04 12:58:41 +11:00
blackst0ne 7ad5a1b371 Add last_edited_at and last_edited_by attributes 2017-05-04 12:58:41 +11:00
blackst0ne 323596f68e Add system note on description change of issue/merge request 2017-05-04 12:58:41 +11:00
Rémy Coutable 349e423137 Merge branch '29673-500-internal-server-error-when-enabling-a-deploy-key-more-than-once-through-api' into 'master'
Detect already enabled DeployKeys in EnableDeployKeyService

Closes #29673

See merge request !11010
2017-05-03 15:11:19 +00:00
Grzegorz Bizon 72307940bb Improve code style related to protected actions 2017-05-03 12:32:39 +02:00
Grzegorz Bizon 738bf2c238 Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (103 commits)
  Include missing project attributes to Import/Export
  Create the rest of the wiki docs
  Fill in information about creating the wiki Home page
  Move wiki doc to its own index page
  Create initial file for Wiki documentation
  Default to null user when asignee is unselected
  Re-enable ref operations with gitaly after not-found fix
  #31560 Add repo parameter to gitaly:install and workhorse:install
  Remove N+1 queries when checking nodes visible to user
  Don't validate reserved words if the format doesn't match
  Revert "Shorten and improve some job names"
  Remove unused initializer
  DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml`
  Make the static-analysis job be run for docs branches too
  Add download_snippet_path helper
  Refresh the markdown cache if it was `nil`
  Add some documentation for the new migration helpers
  Update comments
  Display comments for personal snippets
  Update docs on creating a project
  ...
2017-05-03 12:27:30 +02:00
Mark Fletcher d02e7226c4 Detect already enabled DeployKeys in EnableDeployKeyService
Ensures deploy keys can't be re-added, which causes a validation error
2017-05-03 17:37:08 +08:00
Sean McGivern d32ecb23eb Merge branch '12910-personal-snippets-notes-show' into 'master'
Display comments for personal snippets

See merge request !10974
2017-05-02 14:38:28 +00:00
Jarka Kadlecova 43ff738641 Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
Sean McGivern 3efe534255 Merge branch '26488-target-disabled-mr' into 'master'
Fix 404 when upstream disabled merge requests

Closes #26488

See merge request !10427
2017-05-02 11:14:41 +00:00
Jarka Kadlecova 8c3a03c1b9 Display comments for personal snippets 2017-05-02 13:07:53 +02:00
Grzegorz Bizon d276ea9372 Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (314 commits)
  Better Explore Groups view
  Update Carrierwave and fog-core
  Add specs for Gitlab::RequestProfiler
  Add scripts/static-analysis to run all the static analysers in one go
  Shorten and improve some job names
  Group static-analysis jobs into a single job
  Don't blow up when email has no References header
  Update CHANGELOG.md for 9.1.2
  Add changelog
  Add changelog
  Show Raw button as Download for binary files
  Use blob viewers for snippets
  Fix typo
  Fixed transient failure related to dropdown animations
  Revert "Merge branch 'tc-no-todo-service-select' into 'master'"
  fix link to MR 10416
  Another change from .click -> .trigger('click') to make spec pass
  Change from .click -> .trigger('click') to make spec pass
  Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations
  Add AddColumnWithDefaultToLargeTable cop
  ...

Conflicts:
	spec/requests/api/jobs_spec.rb
2017-05-02 10:40:10 +02:00
Grzegorz Bizon 6baaa8a98e Add new ability check for stopping environment 2017-05-01 13:38:57 +02:00
Stan Hu 303504df47 Revert "Merge branch 'tc-no-todo-service-select' into 'master'"
This reverts merge request !10845
2017-04-29 12:29:59 +00:00