Commit Graph

4010 Commits

Author SHA1 Message Date
Robert Speicher 8b9cd3c072 Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master'
Add support for commit diff ignore_whitespace_change and paths flags

Closes gitaly#198

See merge request !11028
2017-05-07 22:59:30 +00:00
Zeger-Jan van de Weg 8df3997a92 Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
Ahmad Sherif 34cd109797 Re-enable Gitaly commit_raw_diff feature 2017-05-07 23:37:42 +02: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
Stan Hu 58166f03b9 Merge branch 'fix/fork-spec-mysql' into 'master'
Fix fork_spec failure to do with mySQL

Closes #31870

See merge request !11121
2017-05-06 02:02:42 +00:00
Sean McGivern 9e041f2185 Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master'
Generate and handle a gl_repository param to pass around components

Closes #29925

See merge request !10992
2017-05-05 22:08:29 +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
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
Luke "Jared" Bennett e5a7ed3ac3
Review changes 2017-05-05 15:59:03 +01:00
James Lopez cc826c0469 workaround spec failure for mySQL invalid date issue 2017-05-05 16:45:46 +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
Alejandro Rodríguez 8bc381db90 Pass GL_REPOSITORY in Workhorse responses 2017-05-05 10:52:06 -03:00
Alejandro Rodríguez 5249157552 Allow gl-repository strings as project identifiers in PostReceive worker 2017-05-05 10:51:55 -03:00
Robert Speicher 10c1bf2d77 Merge branch 'prometheus-integration-test-setting-fix' into 'master'
Added rescue block for the test method for the prometheus service

Closes #31451

See merge request !10994
2017-05-05 13:50:03 +00:00
Sean McGivern faf2ce89cd Merge branch 'mrchrisw-import-shell-timeout' 2017-05-05 14:40:52 +01:00
Grzegorz Bizon 55cec2177c Refine inheritance model of extended CI/CD statuses 2017-05-05 15:21:06 +02:00
Grzegorz Bizon 2cc8f43e54 Introduce generic manual action extended status class 2017-05-05 15:13:58 +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
Sean McGivern 7af4c0c4f7 Fix email receiver metrics events
`Project#inspect` isn't very useful for examining usage of these features.
2017-05-05 10:37:54 +01: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
blackst0ne cca09bbb18 Update Import/Export files 2017-05-05 16:39:26 +11:00
Ruben Davila 7f24b87b3b Some small updates for Spanish translations. 2017-05-04 19:27:17 -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
Ruben Davila b396668ec5 Add CHANGELOG entry, some specs and locale file for German. 2017-05-04 18:44:19 -05:00
Jose Ivan Vargas 6eb9e981c6 Improved changelog entry, also changed error message for HTTParty error 2017-05-04 18:35:53 -05:00
Douwe Maan 897f98cc9d Fix wording of Cycle Analytics stage legends 2017-05-04 18:12:49 -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
Jose Ivan Vargas 64e8119577 Improved code styling and added a HTTParty rescue block 2017-05-04 13:56:26 -05:00
Jose Ivan Vargas 63a5d98a7c Added specs 2017-05-04 13:56:26 -05:00
Jose Ivan Vargas ad6ac17c54 Added rescue block for the test method for the prometheus service 2017-05-04 13:56:26 -05: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
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Douwe Maan 37b1b14a16 Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'
Sort the network graph both by commit date and topographically

Closes #30973

See merge request !11057
2017-05-04 13:56:58 +00:00
Douwe Maan 0f58eb6bde Add artifact file page that uses the blob viewer 2017-05-04 08:50:12 -05: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
Luke "Jared" Bennett d34f676414
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue 2017-05-04 11:21:40 +01:00
Sean McGivern eddeecf65d Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into 'master'
Handle incoming emails from aliases correctly

See merge request !11079
2017-05-04 08:26:42 +00:00
Timothy Andrew b44eaf8e07 Sort the network graph both by commit date and topographically.
- Previously, we sorted commits by date, which seemed to work okay.

- The one edge case where this failed was when multiple commits have the same
  commit date (for example: when a range of commits are cherry picked with a
  single command, they all have the same commit date [and different author
  dates]).

- Commits with the same commit date would be sorted arbitrarily, and usually
  break the network graph.

- This commit solves the problem by both sorting by date, and by sorting
  topographically (parents aren't displayed until all their children are
  displayed)

- Include review comments from @adamniedzielski

A more detailed explanation is present here:
https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
2017-05-04 04:21:12 +00:00
Ruben Davila dbd1bdaeed More updates for translations plus some refactoring. 2017-05-03 21:08:43 -05:00
Douwe Maan 4faa65d838 Merge branch '31671-merge-request-message-contains-carriage-returns' into 'master'
removes the possibility of commit messages having carriage returns

Closes #31671

See merge request !11077
2017-05-03 22:25:50 +00:00
Alejandro Rodríguez c45341c816 Generate and handle a gl_repository param to pass around components
This new param allows us to share project information between components
that don't share or don't have access to the same filesystem
mountpoints, for example between Gitaly and Rails or between Rails and
Gitlab-Shell hooks. The previous parameters are still supported, but if
found, gl_repository is prefered. The old parameters should be deprecated
once all components support the new format.
2017-05-03 17:37:30 -03:00
Tiago Botelho 268ec199da removes the possibility of commit messages having carriage returns 2017-05-03 21:25:57 +01:00
Sean McGivern c1e2da9293 Merge branch 'dm-blob-external-storage' into 'master'
Refactor Blob support of external storage in preparation of job artifact blobs

See merge request !11048
2017-05-03 19:54:30 +00:00
Sean McGivern eb490365b5 Handle incoming emails from aliases correctly
These set the 'actual' destination email in one of the Delivered-To lines, so
check those too.
2017-05-03 20:51:10 +01:00
Ruben Davila ee65de48d8 More translations updates. 2017-05-03 12:40:21 -05:00
James Lopez cf3990cfbf Fix project tree saver and fork spec failures 2017-05-03 16:36:01 +00:00