summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Send Gitaly Repository with /api/internal/allowedgitaly-internal-allowed-send-repoKim "BKC" Carlbäcker2017-07-073-21/+91
| | | | | - Make single gitaly payload - Add feature-flag specs to verify payload
* Merge branch ↵Phil Hughes2017-07-035-4/+27
|\ | | | | | | | | | | | | | | | | '34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails' into 'master' Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Closes #34097 See merge request !12430
| * Resolve "Issue Board -> "Remove from board" button when viewing an issue ↵Luke "Jared" Bennett2017-07-035-4/+27
|/ | | | gives js error and fails"
* Merge branch 'set-sidebar-height' into 'master'Tim Zallmann2017-07-023-46/+38
|\ | | | | | | | | Make issuable sidebar setSidebarHeight more efficient See merge request !12252
| * Make setSidebarHeight more efficient with SidebarHeightManager.set-sidebar-heightBryce Johnson2017-06-303-46/+38
| |
* | Merge branch 'change-extended-docker-configuration-syntax' into 'master'Grzegorz Bizon2017-07-025-16/+25
|\ \ | | | | | | | | | | | | Make entrypoint and command keys to be array of strings See merge request !12536
| * | Fix rubocop offenseschange-extended-docker-configuration-syntaxTomasz Maczukin2017-07-023-6/+6
| | |
| * | Make entrypoint and command keys to be array of stringsTomasz Maczukin2017-07-025-16/+25
| | |
* | | Merge branch 'enable-webpack-code-splitting' into 'master'Jacob Schatz2017-06-3015-69/+137
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable webpack code splitting Closes #32989 See merge request !12032
| * | | add CHANGELOG.md entry for !12032Mike Greiling2017-06-291-0/+5
| | | |
| * | | configure webpack publicPath dynamically to account for CDN or relative path ↵Mike Greiling2017-06-283-15/+23
| | | | | | | | | | | | | | | | settings
| * | | move webpack publicPath setup earlier in the bootstrap processes to avoid ES ↵Mike Greiling2017-06-284-10/+16
| | | | | | | | | | | | | | | | module execution order issues
| * | | dynamically import emoji helpers for gl-emoji custom tag prototypeMike Greiling2017-06-281-5/+12
| | | |
| * | | dynamically import emoji helpers for GfmAutoComplete classMike Greiling2017-06-281-6/+12
| | | |
| * | | dynamically import emoji helpers for AwardsHandler classMike Greiling2017-06-284-47/+61
| | | |
| * | | dynamically set webpack publicPath when relative_url_root enabledMike Greiling2017-06-282-1/+8
| | | |
| * | | ensure eslint recognizes es2015 dynamic import() syntaxMike Greiling2017-06-283-1/+16
| | | |
* | | | Merge branch 'fix-assigned-issuable-lists' into 'master'Annabel Dunstone Gray2017-06-303-2/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add issuable-list class to shared mr/issue lists to fix new responsive layout See merge request !12591
| * | | Add issuable-list class to shared mr/issue lists to fix new responsive layoutfix-assigned-issuable-liststauriedavis2017-06-303-2/+7
| | | |
* | | | Merge branch 'winh-issue-show-aftereach' into 'master'Clement Ho2017-06-301-3/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove empty afterEach() from issue_show app_spec.js See merge request !12577
| * | | | Remove empty afterEach() from issue_show app_spec.jswinh-issue-show-aftereachWinnie Hellmann2017-06-291-3/+0
| | | | |
* | | | | Merge branch 'restore-timeago-translation' into 'master'Phil Hughes2017-06-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Restore timeago translations in renderTimeago. See merge request !12590
| * | | | | Restore timeago translations in renderTimeago.restore-timeago-translationBryce Johnson2017-06-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'experimental-breadcrumbs' into 'master'Annabel Dunstone Gray2017-06-3019-36/+232
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | New navigation breadcrumbs Closes #34029 See merge request !12346
| * | | | New navigation breadcrumbsPhil Hughes2017-06-3019-36/+232
|/ / / /
* | | | Merge branch 'bpj-init-timeago-timeout-less-frequently' into 'master'Phil Hughes2017-06-302-22/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove initTimeagoTimeout and let timeago.js update timeagos internally. Closes #34340 See merge request !12468
| * | | | Remove initTimeagoTimeout and let timeago.js update timeagos internally.bpj-init-timeago-timeout-less-frequentlyBryce Johnson2017-06-292-22/+4
| | | | | | | | | | | | | | | | | | | | MR: !12468
* | | | | Merge branch 'speed-up-issue-counting-for-a-project' into 'master'Rémy Coutable2017-06-307-66/+252
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up issue counting for a project Closes #33913 See merge request !12457
| * | | | | Fix typo in IssuesFinder commentSean McGivern2017-06-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Make issuables_count_for_state publicspeed-up-issue-counting-for-a-projectSean McGivern2017-06-301-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | This doesn't need to be public in CE, but EE uses it as such.
| * | | | | Clarify counter caching for users without project accessSean McGivern2017-06-301-0/+15
| | | | | |
| * | | | | Make finders responsible for counter cache keysSean McGivern2017-06-305-59/+63
| | | | | |
| * | | | | Add changelog entry for issue / MR tab counting optimisationsSean McGivern2017-06-301-0/+5
| | | | | |
| * | | | | Don't count any confidential issues for non-project-membersSean McGivern2017-06-302-6/+9
| | | | | |
| * | | | | Cache total issue / MR counts for project by user typeSean McGivern2017-06-304-31/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This runs a slightly slower query to get the issue and MR counts in the navigation, but caches by user type (can see all / none confidential issues) for two minutes.
| * | | | | Only do complicated confidentiality checks when necessarySean McGivern2017-06-303-29/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are filtering by a single project, and the current user has access to see confidential issues on that project, we don't need to filter by confidentiality at all - just as if the user were an admin. The filter by confidentiality often picks a non-optimal query plan: for instance, AND-ing the results of all issues in the project (a relatively small set), and all issues in the states requested (a huge set), rather than just starting small and winnowing further.
* | | | | | Merge branch '34036-sidebar-mobile' into 'master'Phil Hughes2017-06-301-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically hide sidebar on smaller screens See merge request !12538
| * | | | | | Automatically hide sidebar on smaller screensAnnabel Dunstone Gray2017-06-301-0/+7
|/ / / / / /
* | | | | | Merge branch 'gitaly-0.14.0' into 'master'Sean McGivern2017-06-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly 0.14.0 See merge request !12586
| * | | | | | Use Gitaly 0.14.0Jacob Vosmaer2017-06-301-1/+1
| | | | | | |
* | | | | | | Merge branch 'adam-external-issue-references-spike' into 'master'Sean McGivern2017-06-3022-118/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve support for external issue references Closes #33679, #34076, and #34082 See merge request !12485
| * | | | | | | Improve support for external issue referencesadam-external-issue-references-spikeAdam Niedzielski2017-06-3022-118/+87
| |/ / / / / /
* | | | | | | Merge branch '34470-fix-award-slash-command-placeholder' into 'master'Phil Hughes2017-06-302-0/+49
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove placeholder note when award emoji slash command is applied Closes #34470 See merge request !12545
| * | | | | | Remove placeholder note when award emoji slash command is appliedKushal Pandya2017-06-302-0/+49
|/ / / / / /
* | | | | | Update CHANGELOG.md for 9.3.3James Edwards-Jones2017-06-307-25/+9
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch '33861-more-actions-dropdown-hidden-by-end-of-diff' into 'master'Annabel Dunstone Gray2017-06-301-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "More actions dropdown hidden by end of diff" Closes #33861 See merge request !12380
| * | | | | Resolve "More actions dropdown hidden by end of diff"Luke "Jared" Bennett2017-06-301-2/+0
|/ / / / /
* | | | | Merge branch '34461-top-banner-job-master' into 'master'Phil Hughes2017-06-301-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Only verifies top position after the request has finished to account for errors See merge request !12559
| * | | | Only verifies top position after the request has finished to account for errorsFilipa Lacerda2017-06-301-5/+5
|/ / / /
* | | | Merge branch 'dz-improve-codeclimate-json-cleanup' into 'master'Kamil Trzciński2017-06-301-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cleanup codeclimate.json file generated by CI See merge request !12565