Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use import and remove commit component from global namespacevue-commit-component-new-standards | Filipa Lacerda | 2017-03-06 | 4 | -175/+168 |
| | |||||
* | Merge branch 'fix-mentioned-issues-for-external-trackers' into 'master' | Sean McGivern | 2017-03-06 | 6 | -21/+45 |
|\ | | | | | | | | | | | | | Fix issues mentioned but not closed for JIRA Closes #26028 See merge request !9687 | ||||
| * | DRY up {jira,kubernets}_project factoriesfix-mentioned-issues-for-external-trackers | Sean McGivern | 2017-03-06 | 1 | -21/+2 |
| | | |||||
| * | Fix issues mentioned but not closed for JIRA | Sean McGivern | 2017-03-06 | 5 | -0/+43 |
| | | | | | | | | | | | | | | The `ReferenceExtractor` would return an array of `ExternalIssue` objects, and then perform `Array#-` to remove the issues closed. `ExternalIssue`s had `==` defined, but not `hash` or `eql?`, which are used by `Array#-`. | ||||
* | | Merge branch 'workhorse-1.4.0' into 'master' | Sean McGivern | 2017-03-06 | 2 | -1/+5 |
|\ \ | | | | | | | | | | | | | Use gitlab-workhorse 1.4.0 See merge request !9724 | ||||
| * | | Use gitlab-workhorse 1.4.0 | Jacob Vosmaer | 2017-03-06 | 2 | -1/+5 |
| |/ | | | | | | | Bug fixes, Gitaly gRPC support, experimental Redis integration. | ||||
* | | Merge branch '28704-fullscreen-zen-mode-is-broken' into 'master' | Annabel Dunstone Gray | 2017-03-06 | 2 | -1/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Set max for Zen mode textarea to screen height Closes #28704 See merge request !9667 | ||||
| * | | Set max for Zen mode textarea to screen height28704-fullscreen-zen-mode-is-broken | Sam Rose | 2017-03-03 | 2 | -1/+6 |
| | | | |||||
* | | | Merge branch '25503_issues_finder_performance' into 'master' | Sean McGivern | 2017-03-06 | 4 | -14/+35 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve IssuableFinder performance Closes #25503 See merge request !9030 | ||||
| * | | | Improve issues filtering performance | Jarka Kadlecova | 2017-03-06 | 4 | -14/+35 |
| | | | | |||||
* | | | | Merge branch 'second-nav-spacing-mobile' into 'master' | Annabel Dunstone Gray | 2017-03-06 | 2 | -10/+20 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed spacing in mobile secondary nav See merge request !9657 | ||||
| * | | | | Changed the styling to allow bigger link targets on mobilesecond-nav-spacing-mobile | Phil Hughes | 2017-03-06 | 1 | -3/+18 |
| | | | | | |||||
| * | | | | Fixed spacing in mobile secondary nav | Phil Hughes | 2017-03-02 | 2 | -9/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the spacing was spread evenly across the width which lead to some weird spacing issues, more noticeable between the user avatar & the dropdown caret | ||||
* | | | | | Merge branch 'api-drop-subscribed' into 'master' | Sean McGivern | 2017-03-06 | 24 | -36/+451 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "subscribed" field from API responses returning list of issues or merge requests Closes #22374 See merge request !9661 | ||||
| * | | | | | Remove "subscribed" field from API responses returning list of issues or ↵api-drop-subscribed | Adam Niedzielski | 2017-03-06 | 21 | -32/+447 |
| | | | | | | | | | | | | | | | | | | | | | | | | merge requests | ||||
| * | | | | | Move schema definitions for our public API to a separate directory | Adam Niedzielski | 2017-03-06 | 3 | -4/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'gitaly-0.3.0' into 'master' | Sean McGivern | 2017-03-06 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gitaly server dependency Closes gitaly#109 See merge request !9722 | ||||
| * | | | | | Add gitaly server dependency | Jacob Vosmaer | 2017-03-06 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GitLab 9.0.0 we want to turn on Gitaly in Omnibus installations. Gitaly is not a required component yet for source installations because we want to iterate on the configuration and architecture some more. Omnibus installations will have the option to completely disable Gitaly if they want to or if necessary. The new GITALY_SERVER_VERSION file which version of the Gitaly server application is needed by the current GitLab version. | ||||
* | | | | | Merge branch 'introduce-pipeline-triggers' into 'master' | Sean McGivern | 2017-03-06 | 25 | -183/+702 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline triggers API See merge request !9713 | ||||
| * | | | | | Fix UserBasicintroduce-pipeline-triggers | Kamil Trzcinski | 2017-03-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Rename `/take` to `/take_ownership`, expose `owner` in `v3`. | Kamil Trzcinski | 2017-03-06 | 4 | -7/+8 |
| | | | | | | |||||
| * | | | | | Update after review | Kamil Trzcinski | 2017-03-06 | 3 | -1/+5 |
| | | | | | | |||||
| * | | | | | Lint doc | Kamil Trzcinski | 2017-03-05 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Move foreign key to separate migration | Kamil Trzcinski | 2017-03-05 | 3 | -3/+13 |
| | | | | | | |||||
| * | | | | | Fix import model attributes | Kamil Trzcinski | 2017-03-05 | 2 | -0/+3 |
| | | | | | | |||||
| * | | | | | Update documentation and expose ID | Kamil Trzcinski | 2017-03-05 | 4 | -109/+172 |
| | | | | | | |||||
| * | | | | | Introduce tests for pipeline triggers | Kamil Trzcinski | 2017-03-05 | 6 | -52/+145 |
| | | | | | | |||||
| * | | | | | Fix trigger model | Kamil Trzcinski | 2017-03-05 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Update db/schema | Kamil Trzcinski | 2017-03-05 | 3 | -3/+6 |
| | | | | | | |||||
| * | | | | | Make triggers to be user aware | Kamil Trzcinski | 2017-03-05 | 6 | -7/+31 |
| | | | | | | |||||
| * | | | | | Make Pipeline Triggers to be user aware | Kamil Trzcinski | 2017-03-05 | 3 | -3/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - they can have owner, - they can be edited, - they have description, - you can take ownership of them | ||||
| * | | | | | Update triggers API | Kamil Trzcinski | 2017-03-05 | 5 | -17/+311 |
| | | | | | | |||||
* | | | | | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' | Robert Speicher | 2017-03-06 | 11 | -57/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remnants of git annex See merge request !9508 | ||||
| * | | | | | | Remove remnants of git annex | Pawel Chojnacki | 2017-03-03 | 11 | -57/+11 |
| | | | | | | | |||||
* | | | | | | | Merge branch '26384-improve-omnibus-mattermost-command-installation-flow' ↵ | Kamil Trzciński | 2017-03-06 | 9 | -31/+57 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Improve Omnibus-Mattermost Command installation flow" See merge request !9257 | ||||
| * | | | | | | | Fix values being called at Array instead of Hash | Z.J. van de Weg | 2017-03-06 | 2 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Improved team selection | Luke "Jared" Bennett | 2017-03-05 | 7 | -27/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review changes | ||||
* | | | | | | | | Merge branch 'delete-pages' into 'master' | Grzegorz Bizon | 2017-03-06 | 4 | -0/+31 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Delete artifacts for pages unless expiry date is specified See merge request !9716 | ||||
| * | | | | | | | Improve docs and specs related to pages artifacts | Grzegorz Bizon | 2017-03-06 | 2 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | Add MR fo changelog about removing pages artifacts | Grzegorz Bizon | 2017-03-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Delete artifacts for pages unless expiry date is specifieddelete-pages | Kamil Trzcinski | 2017-03-05 | 4 | -0/+29 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '28898-fix-search-branches-in-cherry-picking' into 'master' | Sean McGivern | 2017-03-06 | 3 | -1/+28 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix json response in branches controller Closes #28898 See merge request !9710 | ||||
| * | | | | | | | Fix json response in branches controller | George Andrinopoulos | 2017-03-06 | 3 | -1/+28 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'etag-notes-polling' into 'master' | Sean McGivern | 2017-03-06 | 16 | -10/+348 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ETag to improve performance of issue notes polling Closes #27582 See merge request !9036 | ||||
| * | | | | | | | | Execute metrics initializer earlieretag-notes-polling | Adam Niedzielski | 2017-03-01 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that Gitlab::Metrics::RackMiddleware is added before Gitlab::EtagCaching::Middleware. | ||||
| * | | | | | | | | Invalidate ETag cache when note changes | Adam Niedzielski | 2017-03-01 | 2 | -0/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | Add middleware for ETag caching with Redis | Adam Niedzielski | 2017-03-01 | 5 | -0/+269 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove query parameters from notes polling endpoint to make caching easier | Adam Niedzielski | 2017-03-01 | 6 | -8/+52 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'change-colour-for-testing-fallback' into 'master' | Rémy Coutable | 2017-03-06 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change language for testing colour fallback See merge request !9537 | ||||
| * | | | | | | | | | Change language for testing colour fallback | Georg G | 2017-02-26 | 1 | -5/+5 |
| | | | | | | | | | |