summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Restore timeago translations in renderTimeago.restore-timeago-translationBryce Johnson2017-06-301-1/+1
|
* 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
| * | Fix codeclimate job in .gitlab-ci.ymlDmitriy Zaporozhets2017-06-291-1/+1
| | |
| * | Cleanup codeclimate.json file generated by CIDmitriy Zaporozhets2017-06-291-2/+3
| | |
* | | Merge branch 'dm-empty-state-new-merge-request' into 'master'Sean McGivern2017-06-302-3/+10
|\ \ \ | | | | | | | | | | | | | | | | Fix 'New merge request' button for users who don't have push access to canonical project See merge request !12560
| * | | Fix 'New merge request' button for users who don't have push access to ↵dm-empty-state-new-merge-requestDouwe Maan2017-06-292-3/+10
| | | | | | | | | | | | | | | | canonical project
* | | | Merge branch ↵Dmitriy Zaporozhets2017-06-308-33/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34502-gitlab-git-hook-should-set-the-gl_repository-environment-variable' into 'master' Set the GL_REPOSITORY env variable on Gitlab::Git::Hook Closes #34502 See merge request !12572
| * | | | Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variableAlejandro Rodríguez2017-06-298-33/+47
| | |_|/ | |/| |
* | | | Merge branch 'update_issues_board_doc' into 'master'Achilleas Pipinellis2017-06-304-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | updated version of issues baord images (doc) See merge request !12558
| * | | | updated version of issues baord images (doc)Diego de Souza Mendes2017-06-294-0/+0
| | | | |
* | | | | Merge branch 'inject-add-diff-note' into 'master'Phil Hughes2017-06-3012-154/+105
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Render add-diff-note with server and optimize styles See merge request !12103
| * | | | | Render add-diff-note button with server.Bryce Johnson2017-06-2912-154/+105
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves the rendering of the button back to the server, and shows/hides it using opacity rather than display. It also removes the transform applied to the button on hover (scale). Previously, both of these factors automatically triggered a reflow, which creates a performance bottleneck on pages with larger DOM size. MR: !12103
* | | | | Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'Tim Zallmann2017-06-305-15/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed sidebar not collapsing on merge request in mobile screens Closes #32759 See merge request !12489
| * | | | | Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requestsJose Ivan Vargas2017-06-294-17/+42
| | | | | |
| * | | | | Fixed sidebar not collapsing on merge request in mobile screensJose Ivan Vargas2017-06-273-3/+9
| | | | | |
* | | | | | Merge branch 'backport-license-issue-weights' into 'master'Douwe Maan2017-06-292-5/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes to Projects::IssuesController and the search bar See merge request !12551
| * | | | | | Backport changes to Projects::IssuesController and the search barNick Thomas2017-06-292-5/+19
| | | | | | |
* | | | | | | Merge branch 'bugfix/declarative-policy-reloading' into 'master'Douwe Maan2017-06-293-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: use `require_dependency` to bring in DeclarativePolicy Closes #34532 See merge request !12571
| * | | | | | bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloadinghttp://jneen.net/2017-06-293-3/+3
|/ / / / / /
* | | | | | Merge branch '34349-select-branch-dropdown-is-too-close-to-branch-name' into ↵34532-hot-code-reloading-in-development-is-broken-by-new-declarative-policiesAnnabel Dunstone Gray2017-06-292-18/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Select branch dropdown is too close to branch name" Closes #34349 See merge request !12515
| * | | | | | Resolve "Select branch dropdown is too close to branch name"Tim Zallmann2017-06-292-18/+25
|/ / / / / /
* | | | | | Merge branch 'rs-silence-update-pages-service' into 'master'Rémy Coutable2017-06-291-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform unzip quietly in UpdatePagesService Closes gitlab-ee#225 See merge request !12539
| * | | | | | Perform unzip quietly in UpdatePagesServicers-silence-update-pages-serviceRobert Speicher2017-06-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/225
* | | | | | | Merge branch 'new-nav-logo-safari-fix' into 'master'Annabel Dunstone Gray2017-06-291-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new navgiation bar logo height in Safari See merge request !12563
| * | | | | | | Fixed new navgiation bar logo height in SafariPhil Hughes2017-06-291-3/+2
| | | | | | | |
* | | | | | | | Merge branch '34407-flickering-scroll-v1' into 'master'Annabel Dunstone Gray2017-06-291-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix scroll flicker Closes #34407 See merge request !12501
View Lorry Controller Status