summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOGtrack-project-import-failureDouglas Barbosa Alexandre2016-01-261-0/+1
|
* Wrap errors on GitHub importer to raise Projects::ImportService::ErrorDouglas Barbosa Alexandre2016-01-262-7/+12
|
* Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-262-22/+29
|
* Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-253-39/+184
|
* Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre2016-01-262-3/+29
|\ | | | | | | | | | | | | Correct arity for instrumented methods w/o args This should fix the problem of imports not working. See https://gitlab.com/gitlab-org/gitlab-ce/issues/12450#note_3380730 for the details/context of these changes. See merge request !2602
| * Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-252-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that an instrumented method that doesn't take arguments reports an arity of 0, instead of -1. If Ruby had a proper method for finding out the required arguments of a method (e.g. Method#required_arguments) this would not have been an issue. Sadly the only two methods we have are Method#parameters and Method#arity, and both are equally painful to use. Fixes gitlab-org/gitlab-ce#12450
* | Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-2516-64/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlight note code and edit preview More highlighting fixes! Highlighting wasn't applied all the way for code in notes, diff notes diffs and diff preview (on the file edit page). The CSS changes further unify the styling for file-content highlighting, diff highlighting and note code highlighting. See merge request !2594
| * | Highlight note code and edit previewnote-highlightingDouwe Maan2016-01-2516-64/+34
| | |
* | | Merge branch 'rs-rails-security' into 'master' Robert Speicher2016-01-253-35/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update rails, rails-html-sanitizer, and nokogiri for security fixes See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643 See merge request !2603
| * | | Add temporary monkey patch to get specs passing on 4.2.5.1Robert Speicher2016-01-251-0/+6
| | | |
| * | | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-securityRobert Speicher2016-01-252-35/+36
| | |/ | |/| | | | | | | See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643
* | | Merge branch 'doc_refactor_jira' into 'master' Achilleas Pipinellis2016-01-2523-151/+217
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor JIRA documentation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12680 ## TODO - [x] Move JIRA docs from `integration/` to `project_services/` - [x] Split old JIRA info - [x] Add note on document migration - [x] Change references to new location - [x] Add new images - [x] Clean-up `jira.md` See merge request !2592
| * | | Add minimum required GitLab versionAchilleas Pipinellis2016-01-251-3/+6
| | | | | | | | | | | | | | | | [ci skip]
| * | | Remove old JIRA referenceAchilleas Pipinellis2016-01-252-52/+2
| | | |
| * | | Fix typos, grammar and stylingAchilleas Pipinellis2016-01-253-19/+14
| | | |
| * | | Add proper screenshot and comment on the outputdoc_refactor_jiraAchilleas Pipinellis2016-01-253-5/+14
| | | | | | | | | | | | | | | | [ci skip]
| * | | Fix sub-headingAchilleas Pipinellis2016-01-251-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | JIRA doc clean-up [ci skip]Achilleas Pipinellis2016-01-255-50/+94
| | | | | | | | | | | | | | | | | | | | | | | | - Add GitLab configuration steps - Add example workflow - Replace old images with new ones
| * | | Add steps on configuring JIRAAchilleas Pipinellis2016-01-257-13/+62
| | | | | | | | | | | | | | | | [ci skip]
| * | | Split JIRA configuration for GitLab < 7.8 and > 7.8Achilleas Pipinellis2016-01-252-0/+162
| | | | | | | | | | | | | | | | [ci skip]
| * | | Move JIRA from integration to project_servicesAchilleas Pipinellis2016-01-2511-151/+5
| | | |
* | | | Merge branch 'mention_rouge_in_docs' into 'master' Sytse Sijbrandij2016-01-252-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add references to the rouge gem library Give the props to this awesome library we use for syntax highlighting. See merge request !2605
| * | | | Add references to the rouge gem libraryAchilleas Pipinellis2016-01-252-0/+10
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'prioritize-previewable-over-plain-readmes' into 'master' Robert Speicher2016-01-252-4/+76
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Prioritize previewable over plain README files Fixes #12441 See merge request !2521
| * | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-252-4/+76
| | | | |
* | | | | Merge branch 'rm-depr-forum-promolink' into 'master' Robert Speicher2016-01-251-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Substituted deprecated forum link with project issues link. Within the promo partial template we had a Requests link to the deprecated Forum which is now directing to the project's Issue page. See merge request !2255
| * | | | Substituted deprecated forum link with project issues link. [ci skip]Jose Torres2016-01-251-3/+3
|/ / / /
* | | | Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' ↵Jacob Schatz2016-01-258-20/+50
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adds base64 background search icon. All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own `value`. A text and icon placeholder in the center of the input that disappears when typed is only possible with javascript. If you just want the icon or just the text it can be done with css alone. If you want the icon/text justified left, then the search magnifier does not have to disappear. Fixes #11870 cc @skyruler @creamzy ![searchinput](/uploads/136ab91d4ff9ce717979d0ce1a23ab03/searchinput.gif) See merge request !2546
| * | | Border radius to vars.top-search-colors-and-element-position-is-not-like-in-designJacob Schatz2016-01-242-6/+10
| | | | | | | | | | | | | | | | Only top search is gray.
| * | | Distinguishes between search inputs.Jacob Schatz2016-01-242-7/+7
| | | | | | | | | | | | | | | | Main search input has different styles than secondary search inputs.
| * | | Removes extra spacesJacob Schatz2016-01-241-2/+0
| | | |
| * | | Make base64 image smaller by 5000 characters.Jacob Schatz2016-01-241-2/+1
| | | |
| * | | Adds base64 background search icon.Jacob Schatz2016-01-247-15/+44
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own value.
* | | Merge branch 'rails_update' into 'master' Valery Sizov2016-01-252-31/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails updated to 4.2.5 I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383) @dzaporozhets @yorickpeterse See merge request !2591
| * | | rails updated to 4.2.5rails_updateValery Sizov2016-01-252-31/+31
| |/ /
* | | Merge branch 'install-unzip' into 'master' Kamil Trzciński2016-01-251-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Install unzip in build environment [ci skip] See merge request !2593
| * | Install unzip in build environment [ci skip]Kamil Trzcinski2016-01-251-1/+1
|/ /
* | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-01-253-2/+22
|\ \ | |/ |/| | | | | | | | | | | | | Update gitlab_git & use new method for counting branches Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62 Fixes #12418 See merge request !2535
| * Use branch_count in Repository#has_visible_content?Yorick Peterse2016-01-212-1/+21
| | | | | | | | | | Gitlab::Git::Repository#branch_count is a tad faster than the previous setup. See gitlab-org/gitlab_git!62 for more information.
| * Updated gitlab_git to 7.2.24Yorick Peterse2016-01-211-1/+1
| | | | | | | | | | Performance of Gitlab::Git::Repository was improved in merge request gitlab-org/gitlab_git!62.
* | Merge branch 'doc_artifacts' into 'master' Achilleas Pipinellis2016-01-241-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | Add note on artifacts browser functionality Based on the following comment: https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006 See merge request !2586
| * | Add note on artifacts browser functionalityAchilleas Pipinellis2016-01-241-0/+5
|/ / | | | | | | | | | | | | Based on the following comment: https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006 [ci skip]
* | Merge branch 'doc_omniauth' into 'master' Achilleas Pipinellis2016-01-241-13/+17
|\ \ | | | | | | | | | | | | | | | | | | Move supported omniauth providers to the top See merge request !2585
| * | Move supported omniauth providers to the topAchilleas Pipinellis2016-01-241-13/+17
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'doc_integration_imgs' into 'master' Achilleas Pipinellis2016-01-2421-14/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Move all integration docs images in a single directory See merge request !2584
| * | Move all integration docs images in a single directoryAchilleas Pipinellis2016-01-2421-14/+14
|/ / | | | | | | [ci skip]
* | Merge branch 'doc_refactor_system_hooks_api' into 'master' Achilleas Pipinellis2016-01-241-24/+94
|\ \ | | | | | | | | | | | | | | | | | | Refactor system_hooks API documentation See merge request !2475
| * | Clean up system hooks API documentationAchilleas Pipinellis2016-01-241-4/+24
| | | | | | | | | | | | [ci skip]
| * | Remove relative linkdoc_refactor_system_hooks_apiAchilleas Pipinellis2016-01-181-1/+1
| | | | | | | | | | | | | | | | | | It wouldn't work on doc.gitlab.com [ci skip]
| * | Refactor system_hooks API documentation [ci skip]Achilleas Pipinellis2016-01-181-23/+73
| | |
View Lorry Controller Status