Commit Graph

46156 Commits

Author SHA1 Message Date
69b2bc4d59 minor change [ci skip] 2017-02-21 16:46:00 -03:00
334f3283f5 add link to video: pages quick start from forked repo 2017-02-21 16:42:12 -03:00
b90a1656e4 update link 2017-02-20 23:06:00 -03:00
2807cafe41 add video tutorial - Pages admin 2017-02-20 23:05:52 -03:00
625fc65b98 add link to Matija's video 2017-02-20 19:01:05 -03:00
0b1636daf6 add part 3: creating and tweaking CI for Pages 2017-02-20 17:35:31 -03:00
2a7e2a6447 fix links 2017-02-20 17:34:54 -03:00
0aa6856583 add part 2: quick start guide 2017-02-20 17:13:45 -03:00
6d9edfa60b add closing section: further reading 2017-02-20 17:03:22 -03:00
a2b7f8d141 add pages guide part 1 - static sites, domains, DNS, SSL/TLS 2017-02-20 16:14:48 -03:00
6c373e7181 add index file to Pages docs 2017-02-20 15:19:19 -03:00
7c57e0994c Merge branch 'fix-vue-production-build' into 'master'
Utilize bundler-ready Vue distribution

See merge request !9357
2017-02-20 16:12:04 +00:00
6df411b442 Merge branch 'fix-grammar' into 'master'
Fix some grammar in the API docs

See merge request !9379
2017-02-20 16:08:37 +00:00
5643e4d1ea Merge branch 'link-to-rspec-features-docs' into 'master'
Add link to external documentation of rspec-rails feature specs

See merge request !8973
2017-02-20 15:59:52 +00:00
fbbbf1e4e7 Merge branch 'api-post-block' into 'master'
API: Use POST to (un)block a user

Closes #14596

See merge request !9371
2017-02-20 15:16:23 +00:00
7d31cf8601 Fix some grammar in the API docs 2017-02-20 15:54:37 +01:00
173dbeb972 Merge branch 'api-grape-datetime' into 'master'
Use grape validation for dates

See merge request !9375
2017-02-20 14:41:27 +00:00
8f690604a5 API: Use POST to (un)block a user 2017-02-20 15:18:40 +01:00
bc0b438d13 Merge branch '21240_snippets_line_ending' into 'master'
Download snippets with LF line-endings by default

Closes #21240

See merge request !8999
2017-02-20 13:26:22 +00:00
612e61f4c4 Use grape validation for dates 2017-02-20 14:24:09 +01:00
e03a7c53ae Merge branch 'docs/ldap-location' into 'master'
Change wording for LDAP doc that was moved to a new location

See merge request !9373
2017-02-20 13:19:47 +00:00
10f5f3f18f Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master'
Prevent project team from being truncated too early during project destruction

See merge request !9361
2017-02-20 13:15:38 +00:00
d2c640cd47 Change wording for LDAP doc that was moved to a new location
[ci skip]
2017-02-20 14:15:35 +01:00
c89449e611 Merge branch '28082-deleted-branch-event-404' into 'master'
Remove Link from Push Events for deleted branches

Closes #28082

See merge request !9203
2017-02-20 12:34:33 +00:00
6f906da36d Merge branch 'api-remove-deploy-key-disable' into 'master'
API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`

Closes #28286

See merge request !9366
2017-02-20 12:17:51 +00:00
dc303fe2db Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job_page' into 'master'
fix incorrect sidekiq concurrency count in admin background page

Closes #19862

See merge request !9359
2017-02-20 11:22:13 +00:00
f8a736d028 Merge branch 'remove-imports-loader-window-bind' into 'master'
Remove window-binding hack with imports-loader

See merge request !9123
2017-02-20 10:42:39 +00:00
19ff81775c Merge branch '28295-mr-loading-icon' into 'master'
fix MR jobs loading icon visibility

Closes #28295

See merge request !9324
2017-02-20 10:32:13 +00:00
4f40560836 Merge branch 'patch-13' into 'master'
exclude rpc_pipefs from system disk info

See merge request !9355
2017-02-20 09:32:04 +00:00
e7551214f3 API: Remove DELETE projects/:id/deploy_keys/:key_id/disable 2017-02-20 09:33:42 +01:00
c9d687d6fe Download snippets with LF line-endings by default 2017-02-20 07:24:03 +01:00
ae89a89055 utilize pre-minified Vue in production since no CJS distribution is available 2017-02-19 23:04:50 -06:00
45f94ea78c Prevent project team from being truncated too early during project destruction
There are two issues with truncating the project team early:

1. `Projects::UnlinkForkService` may not close merge requests properly since
   permissions may be revoked early.

2. If an error is encountered during flushing of caches, then the user will
   lose all privileges, possibly causing an issue on deletion on retry.
2017-02-19 05:00:27 -08:00
229f806835 loading icon sometimes toggled alongside MR pipeline contents
unbind existing listenerss and remove duplicate MiniPipelineGraph init
2017-02-19 21:40:39 +11:00
bfb686bd08 fix failed spec because haml_lint 2017-02-19 15:44:47 +07:00
a29fbc213c fix incorrect sidekiq concurrency count in admin background page 2017-02-19 15:15:30 +07:00
12cd4c8360 Merge branch 'add-additional-checks-to-ca-data' into 'master'
Small improvements for Cycle Analytics

See merge request !9153
2017-02-18 18:52:43 +00:00
d3afb75238 exclude rpc_pipefs from system disc info 2017-02-18 09:39:49 +00:00
6eb45df2fd Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master'
Todo done clicking is kind of unusable.

Closes #25465

See merge request !8691
2017-02-18 09:06:22 +00:00
5f3f6ee605 Merge branch 'change_queue_weight' into 'master'
Increase process_commit queue weight from 2 to 3

Closes #25828

See merge request !9326
2017-02-18 00:03:08 +00:00
f6ac952819 Merge branch 'global-dropdown-edits' into 'master'
Global dropdown edits

See merge request !9336
2017-02-17 23:37:46 +00:00
c74b7eb271 fix overlooked window binding in spec files 2017-02-17 17:02:14 -06:00
b7aaec05be remove imports loader 2017-02-17 17:02:14 -06:00
721ae6bef6 Merge branch '28313-words' into 'master'
Fix job status -> pipeline status

Closes #28313

See merge request !9320
2017-02-17 23:00:12 +00:00
0f31c5a92b replace implicit this == window with explicit binding 2017-02-17 16:58:32 -06:00
13ad37d8c2 Merge branch 'directly-addressed-todo-docs' into 'master'
Add docs for directly addressed todos

See merge request !9312
2017-02-17 22:57:50 +00:00
a0a81caf4c Merge branch '23819-fix-milestone-counters-to-top-right-of-panel-headings' into 'master'
Fix position of milestone panel counters

Closes #23819

See merge request !7842
2017-02-17 22:27:34 +00:00
ebbf8f6054 Merge branch '28353-little-grammar-issue' into 'master'
Fix grammar issue in admin/runners

Closes #28353

See merge request !9344
2017-02-17 22:00:12 +00:00
71377c1aa0 Merge branch 'remove-issue-and-mr-counts-from-labels-page' into 'master'
Remove issue and MR counts from label index

Closes #25413

See merge request !9332
2017-02-17 21:31:59 +00:00
26160459b5 Todo done clicking is kind of unusable.
The Done button will change to an Undo button and the line item will be greyed out.
Bold links will be unbolded.
The user can undo the task by clicking the Undo button.
2017-02-17 22:12:19 +01:00