Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Display slash commands outcome when previewing Markdownadam-separate-slash-commands | Rares Sfirlogea | 2017-05-04 | 2 | -15/+83 |
| | | | | | | | | | | 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". | ||||
* | Merge branch '12910-uploader-pers-snippet' into 'master' | Sean McGivern | 2017-05-04 | 3 | -3/+3 |
|\ | | | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022 | ||||
| * | Support uploaders for personal snippets comments12910-uploader-pers-snippet | Jarka Kadlecova | 2017-05-02 | 3 | -3/+3 |
| | | |||||
* | | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵ | Sean McGivern | 2017-05-04 | 1 | -5/+11 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 'master' Handle incoming emails from aliases correctly See merge request !11079 | ||||
| * | | Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-come | Sean McGivern | 2017-05-03 | 1 | -5/+11 |
| | | | | | | | | | | | | | | | These set the 'actual' destination email in one of the Delivered-To lines, so check those too. | ||||
* | | | Merge branch '31647-fix-snippet-content_html' into 'master' | Rémy Coutable | 2017-05-04 | 2 | -0/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching large snippet HTML content on MySQL databases Closes #31647 See merge request !11024 | ||||
| * | | | Fix caching large snippet HTML content on MySQL databases | Nick Thomas | 2017-05-03 | 2 | -0/+3 |
| | | | | |||||
* | | | | Merge branch '31544-size-of-project-from-api' into 'master' | Rémy Coutable | 2017-05-04 | 1 | -5/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Size of project from API" Closes #31544 See merge request !11013 | ||||
| * | | | | Expose project statistics on single requests via the API | Mark Fletcher | 2017-05-03 | 1 | -5/+9 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | + The statistics parameter was already accepted * This commit ensure that it is respected for GET /projects/:id endpoint + Add documentation of the parameter and update the example response for stats | ||||
* | | | | Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵ | Douwe Maan | 2017-05-03 | 1 | -21/+0 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' removes the possibility of commit messages having carriage returns Closes #31671 See merge request !11077 | ||||
| * | | | | removes the possibility of commit messages having carriage returns | Tiago Botelho | 2017-05-03 | 1 | -21/+0 |
| | | | | | |||||
* | | | | | Merge branch 'dm-blob-external-storage' into 'master' | Sean McGivern | 2017-05-03 | 1 | -2/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048 | ||||
| * | | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storage | Douwe Maan | 2017-05-03 | 1 | -2/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix project tree saver and fork spec failures | James Lopez | 2017-05-03 | 1 | -0/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch ↵ | Robert Speicher | 2017-05-03 | 2 | -4/+14 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 | ||||
| * | | | | Improve documentation | Shinya Maeda | 2017-05-03 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Add constant as ALLOWED_INDEXED_COLUMNS | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use HasStatus::AVAILABLE_STATUSES instead of hard coding | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Revert "Use JSON type for sorting parameter (halfway)" | Shinya Maeda | 2017-05-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 34127cb13ad72f65a24bdc8fc051363d3edd77cb. | ||||
| * | | | | Use JSON type for sorting parameter (halfway) | Shinya Maeda | 2017-05-03 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | No need to support sha for sorting | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Reduce playable columns for sorting | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add name(User) | Shinya Maeda | 2017-05-03 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Fix how to use PipelinesFinder | Shinya Maeda | 2017-05-03 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | %[] to %w[] | Shinya Maeda | 2017-05-03 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | %w() to %[] | Shinya Maeda | 2017-05-03 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Fix rubocop offences and rspec failures | Shinya Maeda | 2017-05-03 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Add specs. Plus, minor fixes. | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed those points. | Shinya Maeda | 2017-05-03 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - username to user_id - Drop duration - Resolve comments - Add Changelog - Edit docs | ||||
| * | | | | - Add new parameters for Pipeline API | Shinya Maeda | 2017-05-03 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | - Expand PipelinesFinder functions | ||||
* | | | | | Fix lazy error handling of cron parser | Dosuken shinya | 2017-05-03 | 1 | -2/+17 |
| | | | | | |||||
* | | | | | Merge branch 'emoji-button-titles' into 'master' | Filipa Lacerda | 2017-05-03 | 2 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added emoji description title to award emoji buttons Closes #29971 See merge request !10881 | ||||
| * \ \ \ \ | Merge branch 'master' into emoji-button-titles | Phil Hughes | 2017-04-27 | 4 | -32/+23 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into emoji-button-titles | Phil Hughes | 2017-04-27 | 45 | -195/+1188 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Moved the title onto the emoji tag | Phil Hughes | 2017-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the description in all places emojis are used | ||||
| * | | | | | | | Added back yarn:check to rake task... | Phil Hughes | 2017-04-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Added emoji description title to award emoji buttons | Phil Hughes | 2017-04-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #29971 | ||||
* | | | | | | | | Include missing project attributes to Import/Export | James Lopez | 2017-05-03 | 3 | -8/+31 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'fix-n-plus-one-project-features' into 'master' | Rémy Coutable | 2017-05-03 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 queries when checking nodes visible to user See merge request !11040 | ||||
| * | | | | | | | Remove N+1 queries when checking nodes visible to userfix-n-plus-one-project-features | Sean McGivern | 2017-05-02 | 1 | -1/+2 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | N in this case is low, as it's the number of distinct projects referenced from MRs, rather than the number of MRs referenced (issues use their own optimization). Still, on issues or MRs which are often referenced from MRs, it will save a few queries. | ||||
* | | | | | | | Merge branch 'fix-gitaly-not-found' into 'master' | Douwe Maan | 2017-05-02 | 2 | -34/+32 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable ref operations with gitaly after not-found fix See merge request !10773 | ||||
| * | | | | | | | Re-enable ref operations with gitaly after not-found fixfix-gitaly-not-found | Alejandro Rodríguez | 2017-05-02 | 2 | -34/+32 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '30272-bvl-reject-more-namespaces' into 'master' | Douwe Maan | 2017-05-02 | 10 | -20/+404 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject more reserved paths Closes #30272 See merge request !10413 | ||||
| * | | | | | | | Update comments | Bob Van Landuyt | 2017-05-02 | 1 | -0/+8 |
| | | | | | | | | |||||
| * | | | | | | | Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidator | Bob Van Landuyt | 2017-05-02 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Rename child namespaces in migrationhelpers | Bob Van Landuyt | 2017-05-01 | 2 | -2/+7 |
| | | | | | | | | |||||
| * | | | | | | | Clear html cache for a projects milestones | Bob Van Landuyt | 2017-05-01 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Remove dependecy on `User` | Bob Van Landuyt | 2017-05-01 | 1 | -20/+0 |
| | | | | | | | | |||||
| * | | | | | | | Move ReservedPathsMigration into V1 namespace | Bob Van Landuyt | 2017-05-01 | 10 | -352/+362 |
| | | | | | | | | |||||
| * | | | | | | | Minor style adjustments | Bob Van Landuyt | 2017-05-01 | 3 | -7/+6 |
| | | | | | | | |