Commit Graph

141 Commits

Author SHA1 Message Date
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Zeger-Jan van de Weg c17e6a6c68 Real time pipeline show action 2017-05-06 16:45:46 +00:00
Valery Sizov b0a9a7cf5e [Multiple issue assignee]: reslving some conflicts 2017-05-04 17:22:24 +03:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03: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
Alfredo Sumaran b64a37c4ed Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +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
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
Sean McGivern 2df748aa71 Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' 2017-04-27 11:02:27 +01:00
blackst0ne 31c990cc41 Fix rendering emoji inside a string 2017-04-25 21:06:24 +11:00
Timothy Andrew 34b71e734b Don't display the `is_admin?` flag for user API responses.
- To prevent an attacker from enumerating the `/users` API to get a list of all
  the admins.

- Display the `is_admin?` flag wherever we display the `private_token` - at the
  moment, there are two instances:

  - When an admin uses `sudo` to view the `/user` endpoint
  - When logging in using the `/session` endpoint
2017-04-25 09:46:05 +00:00
Pawel Chojnacki 5bf0441fd9 Cleanup deploymentsd controller spec and use schema validation to test the output 2017-04-24 19:55:07 +02:00
Lin Jen-Shin faa5dffbcc After Trace#limit, we seek to the next line in case
of breaking ANSI sequence or Unicode
2017-04-13 21:44:26 +08:00
Kamil Trzciński 7f8e0bce5a Added mock deployment and monitoring service with environments fixtures 2017-04-05 11:04:34 +00:00
blackst0ne 1fb9de2bf7 Change Done column to Closed in issue boards 2017-03-24 23:40:35 +11:00
Valery Sizov a8cf2e8d54 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-07 13:42:45 +02:00
Valery Sizov 710e4df933 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-06 18:50:59 +02:00
James 00f5cb84d5 SanitizationFilter allows html5 details and summary (Issue #21605)
Also adds details/summary tags to Copy-as-GFM
2017-03-06 16:27:49 +00:00
Adam Niedzielski c727d4328f Remove "subscribed" field from API responses returning list of issues or merge requests 2017-03-06 14:17:07 +01:00
Adam Niedzielski 5753acfabc Move schema definitions for our public API to a separate directory 2017-03-06 14:17:07 +01:00
Valery Sizov 800f2a722f [Issue board sorting] Specs 2017-02-28 16:52:49 +02:00
Gabriel Mazetto e49d55e961 Use newer mail_room to get `require_relative` support 2017-02-20 17:38:21 +01:00
Annabel Dunstone Gray c780ad0e92 Remove all instances of theme_id; require downtime 2017-02-15 13:31:18 -06:00
Sean McGivern e6f5177b75 Merge branch 'fix-references-header-parsing' into 'master'
Fix References header parser for Microsoft Exchange

Closes #26567

See merge request !8620
2017-02-06 19:33:21 +00:00
James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce'
# Conflicts:
#   db/schema.rb
2017-02-06 15:12:27 +00:00
Douglas Barbosa Alexandre ffeb3200c1 Add optional id property to the issue schema 2017-02-03 17:02:44 +03:00
Douglas Barbosa Alexandre 79a132a38d Fix spec for Projects::Boards::ListsController 2017-02-03 17:02:43 +03:00
Kamil Trzcinski c4c8ca0405 Added support for zip archives in pages
The ZIP archive size is calculated from artifacts metadata that should get uploaded for new artifacts
2017-01-31 22:53:57 +00:00
Kamil Trzcinski 120f9abaa1 Add GitLab Pages
- The pages are created when build artifacts for `pages` job are uploaded
- Pages serve the content under: http://group.pages.domain.com/project
- Pages can be used to serve the group page, special project named as host: group.pages.domain.com
- User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project
- Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings
- The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB)
- The public/ is extracted from artifacts and content is served as static pages
- Pages asynchronous worker use `dd` to limit the unpacked tar size
- Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml
- Pages are part of backups
- Pages notify the deployment status using Commit Status API
- Pages use a new sidekiq queue: pages
- Pages use a separate nginx config which needs to be explicitly added
2017-01-31 22:50:39 +00:00
Lin Jen-Shin d15b7db121 Fix References header parser for Microsoft Exchange
Microsoft Exchange would append a comma and another
message id into the References header, therefore we'll
need to fallback and parse the header by ourselves.

Closes #26567
2017-01-20 20:19:22 +08:00
Semyon Pupkov a532c6040c Allow to use ENV variables in redis config 2017-01-13 10:41:50 +05:00
tiagonbotelho 3ed96afc47 adds impersonator variable and makes sudo usage overall more clear 2016-12-07 14:42:51 +00:00
http://jneen.net/ f7b0692912 add parsing support for incoming html email 2016-11-17 11:59:44 +09:00
Douwe Maan 9d51421346 Use separate email-friendly token for incoming email and let incoming
email token be reset
2016-11-07 15:55:42 +00:00
Phil Hughes a2eff1a8e5 Merge branch 'master' into issue-board-sidebar 2016-10-26 08:47:09 +01:00
Lin Jen-Shin a4ef4244d4 Preserve note_type and position for notes from emails
Closes #23208
2016-10-20 16:18:53 +08:00
Phil Hughes fcf0a4a12d Merge branch 'master' into issue-board-sidebar 2016-10-19 22:33:34 +01:00
Douglas Barbosa Alexandre 86e0b5d643 Fix issue board related controllers to expose label priority per project 2016-10-19 14:58:27 -02:00
Phil Hughes f1350a5c82 Merge branch 'master' into issue-board-sidebar 2016-10-19 08:44:55 +01:00
Sean McGivern 7529bbae94 Add JSON Schema 2016-10-13 14:16:34 -05:00
Douglas Barbosa Alexandre 53f50edf4d Fix board relates specs 2016-10-11 11:47:56 -03:00
Douglas Barbosa Alexandre ecf4c10e9c Add index action to Projects::BoardsController to return project boards 2016-10-11 11:39:05 -03:00
Phil Hughes 7d20a91b2e Restore subscribe status in JSON 2016-10-07 09:24:57 +01:00
Douglas Barbosa Alexandre 0c286d5473 Fix JSON Schema that validates data returned by board issues endpoint 2016-10-07 09:15:46 +01:00
Douglas Barbosa Alexandre 246bb231c3 Returns the total number of issues in the JSON response 2016-08-31 09:30:37 +01:00
Douglas Barbosa Alexandre 32ca5a88c8 Fix JSON schema to issues in issue board lists 2016-08-19 11:47:33 -03:00
Robert Speicher 717366d28d Merge branch '4273-slash-commands' into 'master'
Support slash commands in issues / MR description & comments

See merge request !5021
2016-08-18 16:41:16 -05:00
Douglas Barbosa Alexandre 29a91c5bc6 Fix matcher `match_response_schema` 2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre 01b9744d1e Returns label description in JSON when listing lists/issues 2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre 215bfd1c9d Returns label priority in JSON when listing lists/issues 2016-08-17 12:58:59 -03:00