Commit Graph

162 Commits

Author SHA1 Message Date
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +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
Zeger-Jan van de Weg c17e6a6c68 Real time pipeline show action 2017-05-06 16:45:46 +00:00
Winnie Hellmann b51f2a6080 Colorize labels in issue search field 2017-05-05 22:47:32 +00: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
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
Ruben Davila 7fd42698aa Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Conflicts:
	lib/gitlab/cycle_analytics/review_stage.rb
	lib/gitlab/cycle_analytics/staging_stage.rb
	lib/gitlab/cycle_analytics/test_stage.rb
2017-05-04 18:51:18 -05:00
Filipa Lacerda 7a66cd688a Merge branch 'deploy-keys-load-async' into 'master'
Deploy keys load async

Closes #29667

See merge request !10973
2017-05-04 18:30:41 +00:00
Phil Hughes 79f40f27fd Merge branch 'master' into deploy-keys-load-async 2017-05-04 15:54:16 +01:00
Grzegorz Bizon 4d08ea6c8c Document serializers 2017-05-04 14:28:28 +00:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03: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
Ruben Davila dbd1bdaeed More updates for translations plus some refactoring. 2017-05-03 21:08:43 -05:00
Phil Hughes f29e5d4d93 Merge branch 'master' into deploy-keys-load-async 2017-05-03 17:04:47 +01: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
Douwe Maan d048d9268c Merge branch 'metrics-deployment-history' into 'master'
Metrics deployment history

Closes #26914

See merge request !10649
2017-05-02 16:56:49 +00:00
Phil Hughes e11a702afc Re-wrote to match our docs - still not 100% sure but closer than it was 2017-04-28 17:06:19 +01:00
Jacob Schatz 57f8be4e69 Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load-async 2017-04-27 16:40:27 -04:00
Luke "Jared" Bennett f5e8d6bded
updated to new favicons 2017-04-25 17:15:52 +01:00
Phil Hughes ee0713babb Generate fixutre for metrics page 2017-04-25 11:23:04 +01:00
Pawel Chojnacki 33f7c40f3f use represent_concise instead of separate entity 2017-04-24 22:34:36 +02:00
Grzegorz Bizon 8c8f6db457 Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (274 commits)
  Update VERSION to 9.2.0-pre
  Update CHANGELOG.md for 9.1.0
  Update Auto Deploy documentation
  Disable import URL field in New project form since it's hidden by default
  Remove reference to burndown charts since they don't exist for ce.
  Use master_password for Sentinel
  Refactor Discussions docs
  Start versioning cached markdown fields
  Refactor add_users method for project and group
  Improved the spec Now correctly tests against different forms
  Refactor environments components into vue files - part 3
  Adding animation for all dropdown
  fix placeholder visibility
  submodule_links: handle urls that don't end with .git
  Add help regarding vue resource and where to include it
  Append .json to ajax endpoint to prevent browser to display raw json
  Fixed the preview keyboard shortcut focusing wrong tab
  Fix broken link
  Added new discussions docs
  Started on resolvable discussions docs
  ...
2017-04-22 21:01:50 +02:00
Pawel Chojnacki e8f2daae8e Cleanup duplicates in deploymentEntityDetailed and add small spec tests 2017-04-20 12:21:24 +02:00
Pawel Chojnacki 4469946105 Reduce the amount of data deployment endpoint returns 2017-04-20 11:58:31 +02:00
Pawel Chojnacki 27cc95ab49 Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_data_source 2017-04-20 11:10:00 +02:00
Sean McGivern 40a972057d Merge branch 'usage-ping-port' into 'master'
Usage ping port

Closes #27750

See merge request !10481
2017-04-19 14:48:31 +00:00
Sean McGivern ac0146a08e Use serializer for formatting cohorts data 2017-04-14 15:20:55 +02:00
Luke "Jared" Bennett fb20dcf8e6
Remove unneeded format block 2017-04-14 11:34:50 +01:00
Grzegorz Bizon a8231ea1be Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (641 commits)
  Revert "Fix registry for projects with uppercases in path"
  Fix registry for projects with uppercases in path
  Move event icons into events_helper
  Reset New branch button when issue state changes
  Add link to environments on kubernetes.md
  Indent system notes on desktop screens
  Improve webpack-dev-server compatibility with non-localhost setups.
  Add changelog entry
  Fix recent searches icon alignment in Safari
  Use preload to avoid Rails using JOIN
  Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error
  Prepare for zero downtime migrations
  Fix filtered search input width for IE
  Fix the `gitlab:gitlab_shell:check` task
  Fixed random failures with Poll spec
  Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates
  Let uses hide verbose output by default
  Separate examples for each other
  Collapse similar sibling scenarios
  Use empty_project for resources that are independent of the repo
  ...

Conflicts:
	app/views/projects/ci/builds/_build.html.haml
2017-04-13 15:08:52 +02:00
Luke "Jared" Bennett c0af1fc4be
Remove helper 2017-04-13 12:14:31 +01:00
Luke "Jared" Bennett deb56f21cb
[ci skip] Use favicon full path 2017-04-13 11:09:20 +01:00
Grzegorz Bizon 2aa211fa69 Use build policy to determine if user can play build 2017-04-12 13:48:43 +02:00
Jarka Kadlecova 703df2881b expose additional values in deploy key entity 2017-04-07 17:08:14 +02:00
Kamil Trzcinski 37a7b099d6
Merge remote-tracking branch 'origin/master' into optimise-pipelines 2017-04-06 22:05:22 +02:00
Lin Jen-Shin 7547e86579 Use preload because we don't want join here 2017-04-06 23:43:15 +08:00
Grzegorz Bizon 7bcca2284b Check branch permission in manual action entity 2017-04-06 17:16:19 +02:00
Grzegorz Bizon 3dbef510c1 Expose manual action abilities from a build entity 2017-04-06 17:15:15 +02:00
Kamil Trzcinski 227a664e5e
Next round 2017-04-06 15:36:13 +02:00
Kamil Trzcinski 93f9e71b0d
Further optimise queries 2017-04-06 15:21:25 +02:00
Kamil Trzcinski 62919a17e1
Update tests and associations 2017-04-06 15:14:40 +02:00
Kamil Trzcinski b828a98c1c
Optimise includes 2017-04-06 15:04:26 +02:00
Kamil Trzcinski 8a1c12aa6f
Introduce endpoint optimisations 2017-04-06 14:33:17 +02:00
Filipa Lacerda 1b85c5a73f Merge branch 'master' into tc-fix-unplayable-build-action-404
* master: (525 commits)
  Introduce "polling_interval_multiplier" as application setting
  fix spelling CI_REPOSITORY_URL (line:355) gitab-ci-token to gitlab-ci-token.
  Pass Gitaly Repository messages to workhorse
  Use gitaly 0.5.0
  Fix specs
  Improve specs examples
  Minor refactor
  Fix BrachFormatter for removed users
  Changelog
  Fix specs
  One more change to the branch names to preserve metadata
  Prefixes source branch name with short SHA to avoid collision
  Fix GitHub importer for PRs of deleted forked repositories
  Change order of specs
  Clean history after every test that changes history
  Clean history state after each test
  Fixes method not replacing URL parameters correctly
  Fix a transient failure caused by FFaker
  Remove unnecessary ORDER BY clause when updating todos
  Add a wait_for_ajax call to ensure Todos page cleans up properly
  ...
2017-04-03 17:22:18 +01:00
Kushal Pandya 9a0f96f9ad Add metrics button to Environment Overview page 2017-03-31 09:20:11 +00:00
Pawel Chojnacki 7320387343 Use DeploymentSerializer to create deployment json 2017-03-28 12:52:13 +02:00
Jarka Kadlecova e0dc73527a Project deploy keys json end point 2017-03-24 11:53:47 +01:00
Dosuken shinya b3375a4964 Add a blank line after a guard clause 2017-03-23 10:37:27 +00:00
Shinya Maeda 1d75989551 Move conditional statement to PipelineSerializer#represent_status 2017-03-23 17:18:11 +09:00