summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOG18881-horizontal-nav-arrowAnnabel Dunstone2016-06-201-0/+1
|
* Add arrow in horizontal scroll fadeAnnabel Dunstone2016-06-207-0/+27
|
* Merge branch 'patch-1' into 'master' Stan Hu2016-06-201-1/+1
|\ | | | | | | | | | | | | Broken instructions. git fetch --all --tags doesn't refresh tags See merge request !4092
| * Broken instructions. git fetch --all --tags doesn't refresh tagsfliespl2016-05-091-1/+1
| |
* | Merge branch 'issue_12758_2' into 'master' Yorick Peterse2016-06-201-1/+2
|\ \ | | | | | | | | | | | | Add notification_settings:events to schema See merge request !4800
| * | Add notification_settings:events to schemaissue_12758_2Felipe Artur2016-06-201-1/+2
| | |
* | | Merge branch 'mr-button-placement' into 'master' Jacob Schatz2016-06-202-2/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed placement of close button on merge requests ## What does this MR do? Fixes the order in which the MR buttons appear ## Screenshots (if relevant) ![Screen_Shot_2016-06-18_at_21.41.38](/uploads/66a88ebc287b7c21160af193ee9de54c/Screen_Shot_2016-06-18_at_21.41.38.png) ![Screen_Shot_2016-06-18_at_21.41.44](/uploads/ba8f6776d79f4eb0af7877c3c71fbb54/Screen_Shot_2016-06-18_at_21.41.44.png) See merge request !4778
| * | | Fixed mobile stylingmr-button-placementPhil Hughes2016-06-201-0/+13
| | | |
| * | | Fixed placement of close button on merge requestsPhil Hughes2016-06-181-2/+2
| | | |
* | | | Merge branch 'fix-double-query-string-url' into 'master' Robert Speicher2016-06-202-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double query string in url This MR should fix the double query string in url that shows up while using the "filter by name .." input on projects list pages and also closes [17743](https://gitlab.com/gitlab-org/gitlab-ce/issues/17743) Closes #17743 See merge request !4480
| * | | using request dot path insteadbarthc2016-06-172-2/+2
| | | |
| * | | Merge branch 'master' into fix-double-query-string-urlbarthc2016-06-171181-6858/+36154
| |\ \ \
| * | | | fix double query string in urlBartholomew2016-06-061-1/+1
| | | | |
* | | | | Merge branch 'pinned-nav-cookie-path' into 'master' Jacob Schatz2016-06-201-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set path for pinned nav cookie ## What does this MR do? Sets a path for the pinned nav cookie so it will be present across page reload. Closes #18836 See merge request !4784
| * | | | | Set path for pinned nav cookiepinned-nav-cookie-pathPhil Hughes2016-06-201-3/+3
| | | | | |
* | | | | | Merge branch 'document-environments' into 'master' Achilleas Pipinellis2016-06-203-6/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document environments and deployments ## What does this MR do? Adds an introduction to environments and deployments and tweaks the `environments` entry in `.gitlab-ci.yml` documentation. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #18683. ## Screenshots (if relevant) ![image](/uploads/1e3355c543abaf7b358f3c37596b1f0b/image.png) ![image](/uploads/58a51505674bcf605039db46833a8ae6/image.png) /cc @ayufan @axil See merge request !4725
| * | | | | | Turn note into normal textdocument-environmentsMark Pundsack2016-06-161-1/+0
| | | | | | |
| * | | | | | Document environments and deploymentsMark Pundsack2016-06-162-0/+60
| | | | | | |
| * | | | | | Tweak grammarMark Pundsack2016-06-161-6/+11
| | | | | | |
* | | | | | | Merge branch '18697-uniqueness-key-validation' into 'master' Yorick Peterse2016-06-207-3/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Duplicated keys adding UNIQUE index to fingerprint See merge request !4787
| * | | | | | | Remove Duplicated keys add UNIQUE index to fingerprint18697-uniqueness-key-validationPaco Guzman2016-06-207-3/+58
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch ↵Robert Speicher2016-06-201-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18810-nameerror-uninitialized-constant-mail-parsers-addressstruct' into 'master' Avoid autoload issue such as 'Mail::Parsers::AddressStruct' This is mostly a shot in the dark but at least it shouldn't break anything. Fixes #18810. See merge request !4793
| * | | | | | | Avoid autoload issue such as 'Mail::Parsers::AddressStruct'18810-nameerror-uninitialized-constant-mail-parsers-addressstructRémy Coutable2016-06-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By eager-loading the Mail gem in the Sidekiq initializer. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'limit-email-diff-size' into 'master' Robert Speicher2016-06-202-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit push email diff size Restrict the size of diffs in push emails to 30 lines / 150 KB (whichever is smaller), following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/85. Emails on push can get very large if they contain a lot of files that sneak under the single-file limit. https://gitlab.com/gitlab-org/gitlab-ee/issues/490 See merge request !4566
| * | | | | | | | Limit push email diff sizelimit-email-diff-sizeSean McGivern2016-06-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit push email diff size to 30 files or 150 KB, whichever comes first.
* | | | | | | | | Merge branch 'dz-admin-tabs-dropdown' into 'master' Jacob Schatz2016-06-204-55/+68
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move part of admin area navigation from tabs into settings dropdown Partly fix https://gitlab.com/gitlab-org/gitlab-ce/issues/18799 See merge request !4796
| * | | | | | | | | Put some admin settings in dropdowndz-admin-tabs-dropdownDmitriy Zaporozhets2016-06-205-71/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Move appearance settings as sub tab to application settingsdz-admin-tabsDmitriy Zaporozhets2016-06-204-14/+23
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'grammar-tweaks' into 'master' Achilleas Pipinellis2016-06-201-23/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grammar tweaks ## What does this MR do? * Updates grammar in recent CI documentation. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Because grammar. ## What are the relevant issue numbers? Needed because of !4200 and !4201. ## Screenshots (if relevant) See merge request !4772
| * | | | | | | | | Grammar and typographic changes to artifacts documentationgrammar-tweaksMark Pundsack2016-06-171-17/+19
| | | | | | | | | |
| * | | | | | | | | Tweak grammarMark Pundsack2016-06-171-6/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'source_omnibus_doc_styleguide' into 'master' Achilleas Pipinellis2016-06-201-0/+56
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation styleguide on configuration settings See merge request !4794
| * | | | | | | | | Add styleguide on configuration settings documentationAchilleas Pipinellis2016-06-201-0/+56
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'fix/import-export-prod' into 'master' Rémy Coutable2016-06-202-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a couple of errors on import/export spotted in production Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829 A couple of tiny bugs spotted after deploying in prod See merge request !4782
| * | | | | | | | use rails root joinJames Lopez2016-06-201-1/+1
| | | | | | | | |
| * | | | | | | | fixed a couple of errors spotted in productionJames Lopez2016-06-202-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-188-2/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix RangeError exceptions when referring to issues or merge requests outside of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777 See merge request !4777
| * | | | | | | Fix RangeError exceptions when referring to issues or merge requests outside ↵Stan Hu2016-06-188-2/+32
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777
* | | | | | | Merge branch 'star-fork-mobile' into 'master' Jacob Schatz2016-06-183-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display Star and Fork on mobile, fix #18537. ## What does this MR do? Displays the Star and Fork buttons on mobile devices. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? I wanted to star and/or fork projects while on my phone, I couldn't do that before. ## What are the relevant issue numbers? #18537 ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png) cc: @jschatz1 See merge request !4714
| * | | | | | | Display Star and Fork on mobile, fix #18537.star-fork-mobileConnor Shea2016-06-163-1/+15
| | | | | | | |
* | | | | | | | Merge branch 'milestones-show-mrs' into 'master' Jacob Schatz2016-06-182-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add merge request data to the progress information on Milestones pages. ## What does this MR do? Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? The milestone progress % didn't accurately reflect the open/merged MRs. ## What are the relevant issue numbers? Fixes #13980 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png) After: ![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] All builds are passing - [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) cc: @jschatz1 See merge request !4719
| * | | | | | | | Add merge request data to the progress information on Milestones pages.milestones-show-mrsConnor Shea2016-06-162-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13980.
* | | | | | | | | Merge branch '18762-feedback-btn' into 'master' Jacob Schatz2016-06-181-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix margin & padding on activity btn ## What does this MR do? Fixes alignment of activity btn ## What are the relevant issue numbers? Closes #18762 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_9.29.06_AM](/uploads/4ab9fb33d450dda72811a5ce2570b8c7/Screen_Shot_2016-06-17_at_9.29.06_AM.png) See merge request !4750
| * | | | | | | | | Fix margin & padding on activity btn18762-feedback-btnAnnabel Dunstone2016-06-171-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'comment-form-button-spacing' into 'master' Jacob Schatz2016-06-183-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of buttons in note forms ## What does this MR do? Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group. ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png) ![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png) See merge request !4740
| * | | | | | | | | | Fixed alignment of buttons in note formscomment-form-button-spacingPhil Hughes2016-06-173-4/+4
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dz-organize-admin-settings' into 'master' Jacob Schatz2016-06-183-64/+70
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin->runners tab as subnav of overview tab cc @annabeldunstone See merge request !4716
| * | | | | | | | | | Move admin->runners tab as subnav of overview tabdz-organize-admin-settingsDmitriy Zaporozhets2016-06-163-64/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'tags-edit-tooltip-placement' into 'master' Jacob Schatz2016-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tooltip placement on edit tags button ## What does this MR do? Moves the placement of the tooltip to the body so not to affect the movement of the button. ## Screenshots (if relevant) Old: ![tooltip-old](/uploads/9ecb9bb919578881994698cd8b1d1826/tooltip-old.gif) New: ![tooltip-new](/uploads/66f90cf95c2ee4001bfa3c65b9de8c05/tooltip-new.gif) See merge request !4737
| * | | | | | | | | | | Fixed tooltip placement on edit tags buttontags-edit-tooltip-placementPhil Hughes2016-06-171-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |