summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reset pushes_since_gc counter before specs run to ensure starting point is 0sh-reset-pushes-since-gc-beforeStan Hu2016-09-181-0/+4
|
* Merge branch 'diff-line-highlighting-fix' into 'master' Jacob Schatz2016-09-171-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix line diff side-by-side line highlighting ## What does this MR do? Fixes line highlighting in diff side-by-side view from working correctly. The JS was looking for a class, but the class doesn't exist & instead it was a data attribute. ## Screenshots (if relevant) ![Screen_Shot_2016-09-13_at_10.26.15](/uploads/7aca730efb14d7bd6bad2a8712fe39d2/Screen_Shot_2016-09-13_at_10.26.15.png) See merge request !6316
| * Fix line diff side-by-side line highlightingdiff-line-highlighting-fixPhil Hughes2016-09-131-2/+2
| |
* | Merge branch 'scrolling-tabs-center-mobile' into 'master' Jacob Schatz2016-09-162-3/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scrolls active tab into middle of nav on mobile ## What does this MR do? On mobile (or smaller screens) it scrolls the currently active tab into the middle of the nav. ## Screenshots (if relevant) ![Screen_Shot_2016-09-15_at_09.38.55](/uploads/4170271b53b9509a385fa7844fb3dc78/Screen_Shot_2016-09-15_at_09.38.55.png) See merge request !6363
| * | Doesnt run JS if active element doesnt existscrolling-tabs-center-mobilePhil Hughes2016-09-161-6/+9
| | |
| * | Scrolls active tab into middle of nav on mobilePhil Hughes2016-09-162-3/+20
| | |
* | | Merge branch 'issue-boards-css-simplify' into 'master' Jacob Schatz2016-09-161-75/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified the CSS for issue boards ## What does this MR do? It gained a lot of extra cruft through the different improvements etc. This removes a lot of the stuff which would hopefully also speed up the browser rendering. - Removed flexbox from a lot of things which in turn reduces it's complexity. - Removed styles that either aren't used or aren't needed. - Various other improvements to the CSS. Basically just improved the CSS by removing overly complex CSS. There are no visible changes to issue boards, just less CSS for the same results. See merge request !6352
| * | | Removed more flexboxissue-boards-css-simplifyPhil Hughes2016-09-151-5/+3
| | | |
| * | | Fixed styling issue with PhantomJS causing builds to failPhil Hughes2016-09-151-1/+1
| | | |
| * | | Fixed height issue on smaller screensPhil Hughes2016-09-151-0/+2
| | | | | | | | | | | | | | | | Fixed IE width issue
| * | | Simplified the CSS for issue boardsPhil Hughes2016-09-151-71/+19
| | | | | | | | | | | | | | | | It gained a lot of extra cruft through the different improvements etc. This removes a lot of the stuff which would hopefully also speed up the browser rendering
* | | | Merge branch 'search-commit-ui-fix' into 'master' Jacob Schatz2016-09-162-8/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed commit search UI ## What does this MR do? Fixes the UI for commits in search. If the scope of the search is commits then it renders the list in a `ul` to match the same styling as that on the commits UI. ## Screenshots (if relevant) ![Screen_Shot_2016-09-05_at_15.30.12](/uploads/f567a224be44d5a9b015ac5d1c399bd7/Screen_Shot_2016-09-05_at_15.30.12.png) ## What are the relevant issue numbers? Closes #21868 See merge request !6205
| * | | | Fixed commit search UIsearch-commit-ui-fixPhil Hughes2016-09-052-8/+11
| | | | | | | | | | | | | | | | | | | | Closes #21868
* | | | | Merge branch 'fix-anchor-icon' into 'master' Jacob Schatz2016-09-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix anchor icon regression An error in scss prevented the markdown header `:hover` anchor icon svg from linking correctly: ![Screen_Shot_2016-09-14_at_4.06.19_PM](/uploads/f4d31a17a58bd7cbde572f91c316dfe1/Screen_Shot_2016-09-14_at_4.06.19_PM.png) The following currently 404s: <https://gitlab.com/assets/icon_anchor.svg> ## What are the relevant issue numbers? #20459 & !5577 See merge request !6358
| * | | | | fix anchor icon regression introduced in 2fd6472 (!5577)fix-anchor-iconMike Greiling2016-09-151-1/+1
| | | | | |
* | | | | | Merge branch 'fix-reduce-contributions-calendar-payload' into 'master' Jacob Schatz2016-09-166-13/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :disappointed: ## 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
| * | | | | | Replace contributions calendar timezone payload with datesClement Ho2016-09-166-13/+52
|/ / / / / /
* | | | | | Merge branch 'feature/use-oj-gem' into 'master' Yorick Peterse2016-09-163-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use oj gem for faster JSON processing See merge request !6395
| * | | | | | Use oj gem for faster JSON processingAhmad Sherif2016-09-163-0/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's mainly intended to improve Elasticsearch indexing performance (through multi_json gem), but other gems could benefit from it too, like grape.
* | | | | | Merge branch 'bump-fog-aws' into 'master' Rémy Coutable2016-09-162-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Bump fog-aws and other dependent modulesStan Hu2016-09-162-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #22260
* | | | | | | Merge branch ↵Rémy Coutable2016-09-163-5/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | Fix API notes endpoint when posting only emojiZ.J. van de Weg2016-09-163-5/+18
| | | | | | |
* | | | | | | Merge branch ↵Stan Hu2016-09-162-7/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22246-actionview-template-error-undefined-method-each-for-nil-nilclass' into 'master' 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
| * | | | | | | MergeRequest#environments now returns an empty array when diff_head_commit ↵22246-actionview-template-error-undefined-method-each-for-nil-nilclassRémy Coutable2016-09-162-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is nil Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'issue-22083' into 'master' Rémy Coutable2016-09-162-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes incorrect reference to `@repository.root_ref` in _readme.html.haml. Fixes #22083 See merge request !6369
| * | | | | | | | fixed incorrect reference to @repository.root_ref in _readme.html.haml. #22083Jason Aquino2016-09-162-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'group_approvers' into 'master' Rémy Coutable2016-09-1630-569/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Remove schema annotations completelyValery Sizov2016-09-1630-569/+1
| | | | | | | | |
* | | | | | | | | Add missing CHANGELOG entryRémy Coutable2016-09-161-0/+1
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'increase_artifact_size_column' into 'master' Yorick Peterse2016-09-163-2/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase ci_builds artifacts_size column to 8-byte integer to allow larger files See merge request !6333
| * | | | | | | | Increase ci_builds artifacts_size column to 8-byte integer to allow larger filesDrew Blessing2016-09-153-2/+18
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'integer_migration_style' into 'master' Yorick Peterse2016-09-163-43/+88
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Integer migration style See merge request !6334
| * | | | | | | fixDrew Blessing2016-09-151-8/+3
| | | | | | | |
| * | | | | | | Add support for column limits in add_column_with_defaultDrew Blessing2016-09-153-44/+94
| |/ / / / / /
* | | | | | | Merge branch 'sh-add-link-to-reliable-capybara-specs' into 'master' Achilleas Pipinellis2016-09-161-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Add link to article on how to write reliable, asynchronous tests with Capybarash-add-link-to-reliable-capybara-specsStan Hu2016-09-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'diff-comments-toggle-tooltip-hide' into 'master' Fatih Acet2016-09-162-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Hides tooltip on discussion toggle button when clickingdiff-comments-toggle-tooltip-hidePhil Hughes2016-09-122-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20750
* | | | | | | | | Merge branch 'issue-boards-large-height-load' into 'master' Fatih Acet2016-09-162-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Fixed issue boards loading issues on large screensissue-boards-large-height-loadPhil Hughes2016-09-132-0/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes #22092
* | | | | | | | | Merge branch 'issue_21824' into 'master' Fatih Acet2016-09-163-9/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issuable templates dropdown for forked projects fixes #21824 See merge request !6329
| * | | | | | | | | Fix issuable templates dropdown for forked projectsissue_21824Felipe Artur2016-09-153-9/+14
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'group-specific-lfs-settings' into 'master' Rémy Coutable2016-09-1621-19/+288
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-1511-26/+137
| | | | | | | | | |
| * | | | | | | | | Correct helper for group LFS status.Patricio Cano2016-09-151-14/+14
| | | | | | | | | |
| * | | | | | | | | Improved helper methods, better flow for `project.lfs_enabled?`, and UI fixes.Patricio Cano2016-09-157-37/+33
| | | | | | | | | |
| * | | | | | | | | Added CHANGELOG itemPatricio Cano2016-09-151-0/+2
| | | | | | | | | |
| * | | | | | | | | Added group-specific setting for LFS.Patricio Cano2016-09-1519-12/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
* | | | | | | | | | Merge branch 'rs-update-rubocop-rspec' into 'master' Rémy Coutable2016-09-163-14/+71
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rubocop-rspec to 1.7.0 See merge request !6357