summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | Clicks the edit button instead of opening the dropdownusing-a-or-m-hotkeys-on-issuable-tabJacob Schatz2016-01-251-2/+2
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2307
| * | | | | | | | | | | | | | | | Merge branch 'visibility-level-text-admin-area' into 'master' Douwe Maan2016-01-262-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility level texts on application settings Introduced by me through !2005 Before: ![Screenshot_from_2016-01-26_09-34-09](/uploads/fa3e8f2522a1d26372c7a06a81119e6f/Screenshot_from_2016-01-26_09-34-09.png) After: ![Screenshot_from_2016-01-26_09-34-27](/uploads/7955003dd02dd5376c9966aafdf4c50b/Screenshot_from_2016-01-26_09-34-27.png) See merge request !2611
| | * | | | | | | | | | | | | | | | Fix visibility level texts on application settingsZeger-Jan van de Weg2016-01-262-2/+3
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by me through !2005
| * | | | | | | | | | | | | | | | Merge branch 'save-button-color-application-settings' into 'master' Douwe Maan2016-01-263-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save button on app settings now btn-save Some save buttons where `btn-primary` where throughout the application these usually are `btn-save`. Before (Application settings) ![Screenshot_from_2016-01-26_09-44-32](/uploads/f4019349c8bac6e0c91e23252a70d334/Screenshot_from_2016-01-26_09-44-32.png) After ![Screenshot_from_2016-01-26_09-45-20](/uploads/8e59a2b180832f44e3908b22187549af/Screenshot_from_2016-01-26_09-45-20.png) See merge request !2612
| | * | | | | | | | | | | | | | | | Save button on app settings now btn-saveZeger-Jan van de Weg2016-01-263-4/+3
| | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-266-64/+222
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track project import failure Fixes #12512 This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450 See merge request !2538
| | * | | | | | | | | | | | | | | | 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 'ci/test-build-artifacts-scripts' into 'master' Douwe Maan2016-01-262-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for clicking a row in build artifacts browser This adds a feature tests for clicking a row, which is handled by javascript event. /cc @ayufan See merge request !2551
| | * | | | | | | | | | | | | | | | Add tests for clicking a row in build artifacts browserci/test-build-artifacts-scriptsGrzegorz Bizon2016-01-222-0/+19
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-262-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 See merge request !2587
| | * | | | | | | | | | | | | | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-242-1/+10
| | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12677
| * | | | | | | | | | | | | | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-262-4/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding (or including) the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 See merge request !2580
| | * | | | | | | | | | | | | | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-232-4/+28
| | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660
| * | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Stan Hu2016-01-261-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Slack integration configuration Adjusted to the current Slack version (as of I 2016). See merge request !2595
| | * | | | | | | | | | | | | | | | Update Slack integration configurationMarcin Zajączkowski2016-01-251-5/+7
| | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-01-251-0/+6
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-262-5/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import redirect loop Fixes #11864 See merge request !2606
| | * | | | | | | | | | | | | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-252-5/+124
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | 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.