Commit Graph

12438 Commits

Author SHA1 Message Date
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +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
Filipa Lacerda b46d38aef4 Move file loading to the top of the file 2017-05-06 22:54:43 +01:00
Filipa Lacerda cc27180ecd Merge branch 'master' into 25226-realtime-pipelines-fe
* master: (40 commits)
  Use GitLab Pages v0.4.2
  Do not reprocess actions when user retries pipeline
  Add specs for extended status for manual actions
  Refine inheritance model of extended CI/CD statuses
  Introduce generic manual action extended status class
  Check ability to update build on the API resource
  Require build to be present in the controller
  Authorize build update on per object basis
  Use update build policy instead of new play policy
  Improve environment policy class
  Rephrase documentation for protected actions feature
  Improve code style related to protected actions
  Add changelog entry for external env URL btn fix
  Hide environment external URL button if not defined
  Fix builds controller spec related to protected actions
  Fix environment policy class name in specs
  Add Changelog entry for protected manual actions
  Document protected manual actions feature
  Improve specs for jobs API regarding manual actions
  Fix Rubocop offense in environments policy class
  ...
2017-05-06 21:36:03 +01: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
Kamil Trzciński 2e6201b131 Merge branch 'fix/gb/hide-environment-external-url-btn-when-not-provided' into 'master'
Hide environment external URL button if not defined

Closes #30832

See merge request !11029
2017-05-06 17:10:06 +00:00
Kamil Trzcinski aa440eb1c0
Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878
It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
2017-05-06 19:04:48 +02: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
Phil Hughes 0c5b7f8475 Merge branch '31632-issue-board-new-issue' into 'master'
Change text of inline issue creation tooltip

Closes #31632

See merge request !11118
2017-05-05 19:02:10 +00:00
Phil Hughes 9caa7e7a54 Merge branch '24883-build-failure-summary-page' into 'master'
Build failures summary page for pipelines

Closes #24883

See merge request !10719
2017-05-05 18:58:01 +00:00
Phil Hughes 2404001522 Merge branch 'issue-title-description-realtime' into 'master'
Render Description Realtime 🎉

Closes #25049 and #31355

See merge request !10865
2017-05-05 18:47:01 +00:00
Phil Hughes ecaa68a709 Merge branch 'balsalmiq-support' into 'master'
Initial balsamiq support

See merge request !10564
2017-05-05 18:43:13 +00:00
Filipa Lacerda 1bf9f012cc Merge branch 'fix-milestone-label-layout' into 'master'
Fixed labels layout on labels milestone tab

See merge request !11120
2017-05-05 18:10:38 +00:00
Phil Hughes b815353510 Merge branch 'add-sentry-js-again-with-vue' into 'master'
Add sentry JS

See merge request !6764
2017-05-05 17:51:38 +00:00
Annabel Dunstone Gray c15e2244bc Merge branch 'cycle-anyltics-landing-box-fix' into 'master'
Fixed cycle analytics intro box styling regression

Closes #31844

See merge request !11111
2017-05-05 17:06:11 +00:00
Annabel Dunstone Gray 17730a6e1f Change text of inline issue creation tooltip 2017-05-05 11:50:05 -05:00
Annabel Dunstone Gray b9a1b0d104 Merge branch '31689-request-access-spacing' into 'master'
31689 Add default margin-top to user request table on project members page

Closes #31689

See merge request !11103
2017-05-05 16:37:24 +00:00
Regis 58b560fae0 resolve discussion 2017-05-05 09:33:39 -06:00
Phil Hughes 505e883fc0 Fixed labels layout on labels milestone tab 2017-05-05 15:42:01 +01:00
James Edwards-Jones 9f3f22c895 Failed Jobs tab only shows 10 job traces for performance 2017-05-05 15:41:37 +01:00
James Edwards-Jones acd9cd0906 Hides pipeline ‘Failed Jobs’ tab when no jobs have failed 2017-05-05 15:41:36 +01:00
James Edwards-Jones 4c0adb9ee9 Build failures summary page for pipelines 2017-05-05 15:01:50 +01: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
Valery Sizov 79b8323d11 [Multiple issue assignees] Fix issue atom feed 2017-05-05 16:57:27 +03:00
Jarka Kadlecova e4f7b87ddb Support comments for personal snippets 2017-05-05 15:45:49 +02:00
Kushal Pandya 645593e5af Add instant comments support 2017-05-05 10:57:29 +00:00
Grzegorz Bizon e944fd7064 Merge commit '3a2b60f7a' from 'master'
* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (254 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:31:10 +02: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
Phil Hughes 6f7933b349 Fixed cycle analytics intro box styling regression
Closes #31844
2017-05-05 10:22:59 +01:00
Filipa Lacerda 07eac529fc Merge branch 'merge-request-poll-json-endpoint' into 'master'
Fixed bug where merge request JSON would show

Closes #28909

See merge request !11096
2017-05-05 09:16:44 +00:00
Rémy Coutable 8b336ae124 Merge branch 'adam-separate-slash-commands' into 'master'
Display slash commands outcome when previewing Markdown

Closes #21531

See merge request !10054
2017-05-05 09:07:56 +00:00
Annabel Dunstone Gray 225662a708 Update design of auth error page 2017-05-05 08:33:04 +00:00
Clement Ho c4094b7ec4 Fix specs 2017-05-04 22:34:15 -05: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
Luke "Jared" Bennett 12fbce2eac Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
#   db/schema.rb
2017-05-04 22:48:21 +00:00
tauriedavis 024427bff6 31689 Add default margin-top to user request table on project members page 2017-05-04 15:17:16 -07:00
Ruben Davila f7b7a52092 More updates for translations plus small tweaks. 2017-05-04 17:05:14 -05:00
Luke "Jared" Bennett 41d0f23108 Resolve "Web GUI: Unable to create new branch from commit SHA" 2017-05-04 18:49:56 +00:00
Jacob Schatz 3a2b60f7a0 Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master'
Fix MR target branch select dropdown placement cut-off

Closes #31271

See merge request !10902
2017-05-04 18:45:22 +00:00
Clement Ho dbb50ed890 Restrict FE assignees to 1 2017-05-04 13:36: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
Clement Ho 4b1d580a84 Fix FE conflicts 2017-05-04 11:43:45 -05:00
Phil Hughes 58e3604439 Fixed bug where merge request JSON would show
Closes #28909
2017-05-04 17:19:41 +01:00
Filipa Lacerda e7b6f39fe1 Merge branch '31760-add-tooltips-to-note-actions' into 'master'
Add tooltips to note action buttons

Closes #31760

See merge request !11082
2017-05-04 15:07:00 +00: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
Sean McGivern d3768dd796 Merge branch 'dm-artifact-blob-viewer' into 'master'
Use blob viewer for job artifacts

Closes #31297

See merge request !11018
2017-05-04 15:01:54 +00:00
Phil Hughes 79f40f27fd Merge branch 'master' into deploy-keys-load-async 2017-05-04 15:54:16 +01:00