- 16 Sep, 2016 37 commits
-
-
Jacob Schatz authored
Replace contributions calendar timezone payload with dates ## What does this MR do? Fixes a ~regression bug introduced in !5784 whereby the calendar squares would not render due to a timezone mismatch between the server timezone and the browser (user) timezone. I am now returning the dates instead of the timezone from the backend. There's a good chance we will still have a calendar off by one error (which is an existing issue #1943) but passing dates should make sure that the calendar activity squares render correctly across timezones. ## Are there points in the code the reviewer needs to double check? Double check that this displays the correct calendar squares when the GitLab instance is hosted in a different timezone than the user viewing it ## Why was this MR needed? Fixes ~regression issue
😞 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-13_at_9.47.06_PM](/uploads/d8b41b9b43320f021452e39f29b0e194/Screen_Shot_2016-09-13_at_9.47.06_PM.png) After: ![Screen_Shot_2016-09-13_at_9.46.11_PM](/uploads/e09a3b35eef77ee1cf73b924c3815d3a/Screen_Shot_2016-09-13_at_9.46.11_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21921 See merge request !6336 -
Clement Ho authored
-
Yorick Peterse authored
Use oj gem for faster JSON processing See merge request !6395
-
Ahmad Sherif authored
It's mainly intended to improve Elasticsearch indexing performance (through multi_json gem), but other gems could benefit from it too, like grape.
-
Rémy Coutable authored
Bump fog-aws and other dependent modules fog-aws CHANGELOG: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md Notable improvements: * Support for ap-south-1 region * Fix for empty ETag values Closes #22260 See merge request !6392
-
Rémy Coutable authored
Merge branch '22256-nomethoderror-api-entities-note-missing-attribute-note-on-awardemoji-0x00000015142480' into 'master' Fix API notes endpoint when posting only emoji Closes #22256 See merge request !6387
-
Stan Hu authored
Closes #22260
-
Z.J. van de Weg authored
-
Stan Hu authored
MergeRequest#environments now returns an empty array when diff_head_commit is nil ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed for a bug introduced in an RC. - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22246 See merge request !6379
-
Rémy Coutable authored
Fixes incorrect reference to `@repository.root_ref` in _readme.html.haml. Fixes #22083 See merge request !6369
-
Rémy Coutable authored
Remove schema annotations completely It removes schema annotations completely. The https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4099 has not done that See merge request !6386
-
Rémy Coutable authored
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Valery Sizov authored
-
Jason Aquino authored
-
Yorick Peterse authored
Increase ci_builds artifacts_size column to 8-byte integer to allow larger files See merge request !6333
-
Yorick Peterse authored
Integer migration style See merge request !6334
-
Achilleas Pipinellis authored
Add link to article on how to write reliable, asynchronous tests with Capybara This article has been incredibly useful for all developers. Adding a link to it so more people can refer to it. See merge request !6312
-
Fatih Acet authored
Hides tooltip on discussion toggle button when clicking ## What does this MR do? Hides the tooltip when clicking the discussion toggle button. Rather than triggering the tooltip to hide we trigger blur. This is because of how _amazing_ Bootstraps tooltips are. They are shown also on focus so if we trigger the tooltip to hide & then mouseover the button again the tooltip still shows. ## What are the relevant issue numbers? Closes #20750 See merge request !6303
-
Fatih Acet authored
Fixed issue boards loading issues on large screens ## What does this MR do? On larger screens it is possible for 20 issues to load (this is the amount per page) & there still to be room underneath the last issue which means the list can't scroll stopping the infinite scrolling working. This MR checks if there are more issues to load, if there are & the height of the scroll area is less than or the same as scroll height then more issues are loaded. This will keep happening until it is possible to scroll, once it is possible to scroll it goes back to the default behaviour of the infinite scrolling. ## What are the relevant issue numbers? Closes #22092 See merge request !6319
-
Fatih Acet authored
Fix issuable templates dropdown for forked projects fixes #21824 See merge request !6329
-
Rémy Coutable authored
Added group-specific setting for LFS. Groups can enable/disable LFS, but this setting can be overridden at the project level. **Admin only** Closes #18092 See merge request !6164
-
Rémy Coutable authored
Bump rubocop-rspec to 1.7.0 See merge request !6357
-
Rémy Coutable authored
Fix spelling: sucessfully -> successfully Originally from gitlab-org/gitlab-ee!682 See merge request !6376
-
Rémy Coutable authored
Sort secret keys by key instead of id. Closes #20870 See merge request !6275
-
Rémy Coutable authored
Fix undefined method when reverting migration `RemoveProjectsPushesSinceGc` See merge request !6375
-
Fatih Acet authored
CI stages #### What does this MR do? Removes individual columns for each stage, consolidating them into one `Stages` column #### Screenshots (if relevant) ![Screen_Shot_2016-09-14_at_12.32.41_PM](/uploads/24f8d817481ba8f711c127bf143649ba/Screen_Shot_2016-09-14_at_12.32.41_PM.png) #### What are the relevant issue numbers? Closes #21925 See merge request !6338
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Drew Blessing authored
-
Drew Blessing authored
-
Drew Blessing authored
-
Stan Hu authored
Originally from gitlab-org/gitlab-ee!682
-
Douglas Barbosa Alexandre authored
-
- 15 Sep, 2016 3 commits
-
-
Jacob Schatz authored
Added keyboard shortcut to navigate to issue boards ## What does this MR do? Adds a keyboard shortcut of `g l` to navigate to issue boards. `g b` would work nicer. However that is taken by builds. Open to suggestions. ## What are the relevant issue numbers? Closes #21218 See merge request !6248
-
Jacob Schatz authored
Update snippets UI ## What does this MR do? Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849. ## Are there points in the code the reviewer needs to double check? Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png) ![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png) ![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18849 See merge request !6210
-
Jacob Schatz authored
Restore gl_dropdown.js changes Restores `fieldName` to allow only string values. `fieldName` was changed to accept function as a value in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/581 Since the approach changed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687 there's no need to accept function as value. Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687 EE Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/919 See merge request !6234
-