Commit Graph

2331 Commits

Author SHA1 Message Date
kushalpandya f66006169b Add Prometheus memory sparkline to MR widget 2017-05-09 19:30:22 +05:30
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
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
Sean McGivern 56fb7823f9 Merge branch '17361-redirect-renamed-paths' into 'master'
Resolve "Redirect to new project link after a rename"

Closes #17361 and #30317

See merge request !11136
2017-05-06 05:45:56 +00:00
Winnie Hellmann b51f2a6080 Colorize labels in issue search field 2017-05-05 22:47:32 +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
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
Michael Kozono e1c245af51 Resolve discussions 2017-05-05 12:12:51 -07:00
Michael Kozono f05469f99b Resolve discussions 2017-05-05 12:12:50 -07:00
Michael Kozono 9e48f02ea8 Dry up routable lookups. Fixes #30317
Note: This changes the behavior of user lookups (see the spec change) so it acts the same way as groups and projects. Unauthenticated clients attempting to access a user page will be redirected to login whether the user exists and is publicly restricted, or does not exist at all.
2017-05-05 12:12:50 -07:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07: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
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
Alejandro Rodríguez 8bc381db90 Pass GL_REPOSITORY in Workhorse responses 2017-05-05 10:52:06 -03:00
Jarka Kadlecova e4f7b87ddb Support comments for personal snippets 2017-05-05 15:45:49 +02:00
Grzegorz Bizon 3264e09c6f Require build to be present in the controller 2017-05-05 14:04:51 +02:00
Grzegorz Bizon 61dd92aaff Authorize build update on per object basis 2017-05-05 14:04:45 +02:00
Kamil Trzciński a5347fe58f Merge branch '30237-pipelines-actions-make-2-requests' into 'master'
Resolve: "Pipelines: When we retry a pipeline 2 requests are made to the pipelines endpoint"

Closes #30237

See merge request !10584
2017-05-05 10:01:21 +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
Grzegorz Bizon c68bf4327b Use wrap_parameters in pipelines controller
This makes it possible to workaround a bug in `safe_constantize` which
caused a `LoadError` exception when doing

```
"Pipeline".safe_constantize
LoadError: Unable to autoload constant Pipeline, expected
/home/grzesiek/gdk/gitlab/app/models/ci/pipeline.rb to define it
```

See https://github.com/rails/rails/issues/28854 for more details.
2017-05-05 09:32:13 +02:00
Grzegorz Bizon b8960354fe Respond with no content for pipeline JSON actions 2017-05-05 09:32:13 +02:00
Filipa Lacerda a1debf5cf0 Retry and cancel endpoints send 204 json response. Request is made with type json 2017-05-05 09:32:13 +02: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
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
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03: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
Rémy Coutable ef71bf6278 Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'
Disable navigation to Pages config if Pages is disabled

Closes #30529

See merge request !11008
2017-05-04 09:27:52 +00: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
Mark Fletcher 3ce95e7c16 Disable navigation to Pages config if Pages is disabled
* Regards project-level pages config
- Nav link is now shown only if Pages is enabled for instance
- Navigation to following controllers denied if Pages disabled:
  * projects/pages_controller
  * projects/pages_domains_controller
- 'disabled' partial removed
+ Test for pages_controller introduced
2017-05-04 14:11:40 +08:00
Robert Speicher 9604ce524f Merge branch 'dm-artifact-browser-header' into 'master'
Add breadcrumb, build header and pipelines submenu to artifacts browser

See merge request !11050
2017-05-03 22:23:31 +00:00
Douwe Maan df36f1f47b Add breadcrumb, build header and pipelines submenu to artifacts browser 2017-05-03 16:32:36 -05:00
Sean McGivern 21e4f0534d Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'
Allow commenting on older versions of the diff and comparisons between diff versions

See merge request !10388
2017-05-03 21:27:34 +00: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
Douwe Maan f8fabfcc6f Allow commenting on older versions of the diff and comparisons between diff versions 2017-05-03 14:47:21 -05:00
Robert Speicher 501cb18be3 Merge branch '28408-feature-proposal-include-search-options-to-pipelines-api' into 'master'
Resolve "Feature Proposal: Include search options to pipelines API"

Closes #28408

See merge request !9367
2017-05-03 16:14:42 +00:00
Phil Hughes f29e5d4d93 Merge branch 'master' into deploy-keys-load-async 2017-05-03 17:04:47 +01:00
Douwe Maan 720cc14a75 Refactor Blob support of external storage in preparation of job artifact blobs 2017-05-03 10:20:05 -05:00
Jacob Schatz c45e11f179 Merge branch 'async-milestone-tabs' into 'master'
Load milestone tabs asynchronously

See merge request !10919
2017-05-03 15:15:20 +00:00
Regis 290cba5b23 remove curr and previous states - extract tasks logic to tasks action 2017-05-02 12:53:03 -06:00
Shinya Maeda e9d9445195 - Add new parameters for Pipeline API
- Expand PipelinesFinder functions
2017-05-03 02:11:50 +09: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