summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure correct filter order to validate with our markdown specpatch/fix-markdown-preview-wikisGabriel Mazetto2016-04-063-4/+8
|
* Fix a few edited references from WikiLinkFilter and specsGabriel Mazetto2016-04-063-6/+12
|
* Fixed WikiPipeline and specsGabriel Mazetto2016-04-062-4/+7
|
* Added WikiLinkFilterGabriel Mazetto2016-04-012-2/+56
|
* Fixed Gollum pages link url expansion to render correctly in previewGabriel Mazetto2016-03-302-6/+14
|
* Add specific markdown_preview route for WikisGabriel Mazetto2016-03-303-1/+20
|
* Merge branch 'functional-closed-sidebar' into 'master' Dmitriy Zaporozhets2016-03-309-26/+116
|\ | | | | | | | | | | | | | | | | | | | | | | | | Functional closed sidebar Adds functionality to include the closed sidebar. When sidebar is closed the details will be visible once changed in open sidebar. This MR fixes some bugs and adds some features from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3175 Fixes: #13594 See merge request !3411
| * Remove console logsJacob Schatz2016-03-301-1/+0
| |
| * Off the event initiallyJacob Schatz2016-03-301-1/+2
| |
| * Collapsed sidebar opens over instead of pushing content.Jacob Schatz2016-03-302-1/+7
| |
| * Sidebar collapse update issueJacob Schatz2016-03-307-18/+71
| |
| * User selection from collapsed sidebarJacob Schatz2016-03-301-0/+17
| |
| * Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
| |
| * Make changed values visible in minimized sidebar.Jacob Schatz2016-03-303-25/+39
|/
* Merge branch 'notification-settings-save' into 'master' Rémy Coutable2016-03-301-16/+17
|\ | | | | | | | | | | | | Fixed issue with notification settings not saving Closes #14736 See merge request !3452
| * Fixed issue with notification settings not savingPhil Hughes2016-03-301-16/+17
|/ | | | Closes #14736
* Merge branch 'rs-banzai-requires' into 'master' Rémy Coutable2016-03-3018-38/+0
|\ | | | | | | | | | | | | | | | | | | | | Remove redundant `require`s from Banzai files We're trying to avoid circular dependency errors. Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521 Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/ See merge request !3391
| * Remove redundant `require`s from Banzai filesrs-banzai-requiresRobert Speicher2016-03-2418-38/+0
| | | | | | | | We're trying to avoid circular dependency errors.
* | Merge branch 'added-milestone-upcoming' into 'master' Rémy Coutable2016-03-3012-59/+139
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown bug fixes - Added back upcoming to milestone filter ![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png) - Fixed bug that would cause the currently selected value to disappear on filters - Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past Closes #14536 See merge request !3368
| * | Spec updatesadded-milestone-upcomingPhil Hughes2016-03-292-8/+6
| | |
| * | Updated based on Ruby feedbackPhil Hughes2016-03-294-6/+6
| | |
| * | Ruby fixesPhil Hughes2016-03-292-12/+5
| | |
| * | Fixed multiselectPhil Hughes2016-03-292-28/+6
| | |
| * | Fixed rubocop issuesPhil Hughes2016-03-291-5/+6
| | |
| * | Fixed issue with milestone not being un-selectablePhil Hughes2016-03-291-0/+2
| | |
| * | Standardised the output of the JSON to always include the namePhil Hughes2016-03-296-14/+31
| | | | | | | | | | | | The frontend will then always use the name as the ID - like previous
| * | Removed un-used codePhil Hughes2016-03-291-11/+0
| | |
| * | Updated to only include upcoming on filtersPhil Hughes2016-03-292-3/+24
| | | | | | | | | | | | Fixes tests
| * | Added tests for upcoming milestone filterPhil Hughes2016-03-292-0/+68
| | |
| * | Dropdown bug fixesPhil Hughes2016-03-296-23/+36
| | | | | | | | | | | | | | | | | | Added back upcoming to milestone filter Fixed bug that would cause the currently selected value to disappear on filters Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
* | | Merge branch 'fix-mr-comment-commit-pruned' into 'master' Robert Speicher2016-03-293-4/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle notes on deleted commits in merge requests Closes #3250 See merge request !3402
| * | | Gracefully handle notes on deleted commits in merge requestsStan Hu2016-03-283-4/+10
| | | | | | | | | | | | | | | | Closes #3250
* | | | Merge branch ↵Robert Speicher2016-03-295-44/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' api - expose label description Resolves #14415 See merge request !3314
| * | | | api - expose label descriptionMariusz Jachimowicz2016-03-245-44/+83
| | |_|/ | |/| |
* | | | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-293-5/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
| * | | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-283-5/+16
| | | | | | | | | | | | | | | | | | | | Fixes #14692
* | | | | Merge branch 'handle-nil-description-slack-message' into 'master' Robert Speicher2016-03-293-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil descriptions in Slack issue messages Closes #14676 See merge request !3420
| * | | | | Handle nil descriptions in Slack issue messagesStan Hu2016-03-283-1/+12
| | |_|/ / | |/| | | | | | | | | | | | | Closes #14676
* | | | | Merge branch 'gitlab-shell-2.7' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated gitlab-shell to 2.7 This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42. See merge request !3437
| * | | | | Updated gitlab-shell to 2.7gitlab-shell-2.7Yorick Peterse2016-03-291-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.
* | | | | Merge branch 'rs-fix-migrations' into 'master' Dmitriy Zaporozhets2016-03-295-34/+54
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Use raw SQL instead of Rails models in migrations where appropriate Closes #14694. See merge request !3429
| * | | | Use raw SQL instead of Rails models in migrations where appropriaters-fix-migrationsRobert Speicher2016-03-285-34/+54
| | | | | | | | | | | | | | | | | | | | Closes #14694.
* | | | | Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master' Rémy Coutable2016-03-291-21/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix order of steps to prevent PostgreSQL errors when running migration Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100. /cc @stanhu @rodrigomanhaes See merge request !3355
| * | | | | Fix order of steps to prevent PostgreSQL errors when running migration [ci skip]doc-update-8.5-to-8.6-fix-steps-orderRodrigo Manhães2016-03-221-21/+21
| | | | | |
* | | | | | Merge branch 'fix/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-294-21/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when visiting CI root path Closes #14528, closes #14687 See merge request !3377
| * | | | | | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-293-25/+20
| | | | | | |
| * | | | | | Add definition of before action that has been movedGrzegorz Bizon2016-03-253-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14528
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-296-16/+387
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-296-16/+387
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
| | * | | | | | Ensure project snippets have their own access levelRémy Coutable2016-03-255-16/+266
| | | | | | | |
View Lorry Controller Status