summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a section on issue/MR labeling in CONTRIBUTING.mddocs/contributing-md-labelsAchilleas Pipinellis2017-03-101-0/+5
| | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25097 [ci skip]
* Merge branch 'update-install-guides-9-0' into 'master' Rémy Coutable2017-03-102-2/+236
|\ | | | | | | | | Flush out the update guide from 8.17 - 9.0 See merge request !9823
| * Add missed review update for 8.17 to 9.0 documentupdate-install-guides-9-0DJ Mountney2017-03-091-1/+0
| | | | | | | | Missed removing one of the redundant lines
| * Cleanup 8.17 to 9.0 doc with review suggestionsDJ Mountney2017-03-091-7/+7
| | | | | | | | | | Fix redundant wording. Clean up code blocks and links.
| * Flush out the update guide from 8.17 - 9.0DJ Mountney2017-03-082-2/+237
| | | | | | | | And bump the stable branch version in the installation from source guide
* | Merge branch '27899-fix-diff-view-comment-form-placement' into 'master'Jacob Schatz2017-03-091-2/+8
|\ \ | | | | | | | | | | | | | | | | | | Get view type based on diff_view Cookie Closes #27899 See merge request !9821
| * | Get view type based on diff_view Cookie27899-fix-diff-view-comment-form-placementAlfredo Sumaran2017-03-081-2/+8
| | | | | | | | | | | | This is because we need to persist the same view type across tabs
* | | Merge branch 'dm-downtime-check-only-added-files' into 'master' Robert Speicher2017-03-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Only check new migrations in 'rake downtime_check' See merge request !9785
| * | | Only check new migrations in 'rake down_timecheck'dm-downtime-check-only-added-filesDouwe Maan2017-03-081-1/+1
| | | |
* | | | Merge branch 'convert-data-attr-search-bar' into 'master' Alfredo Sumaran2017-03-091-17/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert data attributes in search_bar.html.haml Closes #29082 See merge request !9819
| * | | | Convert data attributes in search_bar.html.hamlClement Ho2017-03-091-17/+17
| | | | |
* | | | | Merge branch '28874-fix-milestone-issues-position-order-in-api' into 'master' Rémy Coutable2017-03-095-6/+40
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Order milestone issues by position ascending in api Closes #28847 See merge request !9635
| * | | | Order milestone issues by position ascending in apiGeorge Andrinopoulos2017-03-095-6/+40
|/ / / /
* | | | Merge branch '29048-user-wrap-firefox' into 'master' Clement Ho2017-03-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline-block styling from dropdown avatars Closes #29048 See merge request !9840
| * | | | Remove inline-block styling from dropdown avatars29048-user-wrap-firefoxAnnabel Dunstone Gray2017-03-091-2/+2
| | | | |
* | | | | Merge branch '29014-create-issue-form-buttons-misaligned-on-mobile' into ↵Filipa Lacerda2017-03-092-13/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [#29014] Create issue form buttons are misaligned on mobile Closes #29014 See merge request !9706
| * | | | | [#29014] Create issue form buttons are misaligned on mobileTM Lee2017-03-092-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Ensure Save/Create button is aligned with Cancel - Move the cancel button above but float to the right using pull-right - Allows responsive css to flow
* | | | | | Merge branch 'diff-avatar-improvements' into 'master' Filipa Lacerda2017-03-093-4/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff avatar improvements Closes #29237, #29238, and #29243 See merge request !9829
| * | | | | | Added regression testsdiff-avatar-improvementsPhil Hughes2017-03-091-0/+50
| | | | | | |
| * | | | | | Check was in wrong part, the avatar container class should always be added ↵Phil Hughes2017-03-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | on lines in the changes tab
| * | | | | | Fixed bugs with diff comment avatarsPhil Hughes2017-03-092-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment button on commit view was way out to the left side because the element that renders the diff avatars was rendering when it shouldnt be When commenting on a discussion on the discussions tab it would try to render the avatar & in some cases work correctly even though it shouldnt be possible for this to happen. Changed the if statement to take this into account Closes #29237, #29238, #29243
* | | | | | | Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master' Filipa Lacerda2017-03-0911-366/+375
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update emojis to use harmony modules (import/export) See merge request !9784
| * | | | | | | Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modulesEric Eastwood2017-03-0811-366/+375
| | | | | | | |
* | | | | | | | Merge branch '28030-infinite-offset' into 'master' Filipa Lacerda2017-03-094-2/+107
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | respect offset and limit query params for infinite lists Closes #28030 See merge request !9540
| * | | | | | | | respect offset and limit query params for infinite lists28030-infinite-offsetSimon Knox2017-03-094-2/+107
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rc-document-approvals-in-engineering-workflow' into 'master' Sean McGivern2017-03-091-4/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document "How to get your MR reviewed, approved, and merged" See merge request !9839
| * | | | | | | | Document "How to get your MR reviewed, approved, and merged"Rémy Coutable2017-03-091-4/+30
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'protobuf-from-source' into 'master' Sean McGivern2017-03-092-0/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instructions for installing google-protobuf from source See merge request !9665
| * | | | | | | | Instructions for installing google-protobuf from sourceJacob Vosmaer2017-03-092-0/+32
| |/ / / / / / /
* | | | | | | | Merge branch 'docs/ci-variables-deprecation-table' into 'master' Achilleas Pipinellis2017-03-092-100/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup CI variables table and add a deprecation note See merge request !9831
| * | | | | | | | Move example variables output to bottomdocs/ci-variables-deprecation-tableAchilleas Pipinellis2017-03-091-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Cleanup CI variables table and add a deprecation noteAchilleas Pipinellis2017-03-092-65/+62
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'update-ace' into 'master' Rémy Coutable2017-03-092-1/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ACE to 1.2.6 Closes #26640 See merge request !9835
| * | | | | | | Update ACE to 1.2.6update-aceSean McGivern2017-03-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes input problems with compose key in Chrome 53+ - has been reported for Chinese and Hangul at least.
* | | | | | | | Merge branch 'dz-nested-groups-members' into 'master' Dmitriy Zaporozhets2017-03-096-44/+69
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show members of parent groups on project members page Closes #28786 and #27962 See merge request !9764
| * | | | | | | | Fix group members method for project import/exportDmitriy Zaporozhets2017-03-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Show members of parent groups on project members pagedz-nested-groups-membersDmitriy Zaporozhets2017-03-095-43/+62
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-091-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Make clear that commits trigger CI jobs in quick start guide See merge request !9805
| * | | | | | | Update README.md Alex Karnovsky2017-03-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | I replaced "merge requests" by "commits". As far as I notice, merge requests per se don't trigger CI; commits and pushes (which are essentially adding commits) do. This is logical: an MR doesn't create anything new, so there is nothing to test.
* | | | | | | | Merge branch 'storage-validation-improvement' into 'master' Sean McGivern2017-03-092-45/+63
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve storage validation after configuration structure update See merge request !9811
| * | | | | | | | Improve storage validation after configuration structure updatestorage-validation-improvementAlejandro Rodríguez2017-03-082-45/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides improving the error message to specify what exactly you need to do to solve the error, we now don't skip all storage validations on the test environment, so that you also get a nice error message if you're running tests. Now if conditions are met to skip valitaions (test env or env variable) we still make sure the settings _look_ sane, we just skip verifying the paths exists and meet the given conditions.
* | | | | | | | | Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' Kamil Trzciński2017-03-097-4/+102
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verbosify blocked pipeline status description Closes #29134 See merge request !9800
| * | | | | | | | Add specs for an extended blocked pipeline statusfeature/gb/verbosify-blocked-pipeline-statusGrzegorz Bizon2017-03-082-0/+50
| | | | | | | | |
| * | | | | | | | Adjust specs for core pipeline detailed statusesGrzegorz Bizon2017-03-082-3/+25
| | | | | | | | |
| * | | | | | | | Verbosify blocked pipeline status descriptionGrzegorz Bizon2017-03-083-1/+27
| | | | | | | | |
* | | | | | | | | Merge branch 'change-activity-view-wording' into 'master' Dmitriy Zaporozhets2017-03-091-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change activity view wording See merge request !9777
| * | | | | | | | | Change activity view wordingchange-activity-view-wordingAnnabel Dunstone Gray2017-03-071-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'move-u2f-bundle' into 'master' Alfredo Sumaran2017-03-094-4/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move u2f javascript library to webpack config See merge request !9755
| * | | | | | | | | | move u2f library to webpackmove-u2f-bundleMike Greiling2017-03-074-4/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '28402-fix-starred-projects-filter-wrong-message-on-no-results' ↵Rémy Coutable2017-03-093-10/+33
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix wrong message on starred projects filtering Closes #28402 See merge request !9488