summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expect @issuable_meta_data to be set, feedback:fix-project-without-repo-and-wikiLin Jen-Shin2017-03-161-0/+1
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9956#note_25445832
* Fix projects without repo and wikiLin Jen-Shin2017-03-152-2/+4
| | | | | | | | When repo and wiki are disabled for a project, we're showing issues so we'll need to set @issuable_meta_data otherwise it would be giving nil errors. See: https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/23106/
* Merge branch 'fix-migration-rc1-rollback' into 'master' Stan Hu2017-03-152-2/+6
|\ | | | | | | | | Fixing two migrations that could not be rolled back See merge request !9953
| * Fixing two migrations that could not be rolled backfix-migration-rc1-rollbackDJ Mountney2017-03-142-2/+6
|/ | | | when rolling back from 9-0-stable to 8.17.3
* Merge branch '29414-fix-toggle-disccusion-link-jump-pick-into-9-0' into ↵Alfredo Sumaran2017-03-151-1/+6
|\ | | | | | | | | | | | | | | | | | | 'master' Fix link togglers jumping to top Closes #29414 See merge request !9943
| * Fix link togglers jumping to top29414-fix-toggle-disccusion-link-jump-pick-into-9-0Eric Eastwood2017-03-141-1/+6
| | | | | | | | Fix #29414
* | Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' Alfredo Sumaran2017-03-157-6/+122
|\ \ | | | | | | | | | | | | | | | | | | Toggle long Project names Closes #28187 See merge request !9501
| * | Toggle project name if too long28187-project-name-cut-off-with-nested-groupsSam Rose2017-03-137-6/+122
| | |
* | | Merge branch 'preserve_order_issue_board' into 'master' Douwe Maan2017-03-144-1/+49
|\ \ \ | | | | | | | | | | | | | | | | Preserve order by priority on issues board See merge request !9939
| * | | Preserve order by priority on issues boardpreserve_order_issue_boardValery Sizov2017-03-144-1/+49
| | | |
* | | | Merge branch 'sh-expand-on-definition-of-done' into 'master' Stan Hu2017-03-142-0/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add performance/scalability concerns to CONTRIBUTING.md See merge request !8677
| * | | | Describe polling with ETag cachingsh-expand-on-definition-of-doneAdam Niedzielski2017-03-142-2/+44
| | | | |
| * | | | Add performance/scalability concerns to CONTRIBUTING.mdStan Hu2017-03-131-0/+7
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch '29425-fix-activity-stream-first-line-markdown' into 'master' Robert Speicher2017-03-143-5/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix first line markdown helper for user profile activity stream Closes #29425 See merge request !9920
| * | | | | Fix first line markdown helper for user profile activity stream29425-fix-activity-stream-first-line-markdownEric Eastwood2017-03-143-5/+21
| | |_|_|/ | |/| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29425
* | | | | Merge branch 'fix-intermittent-notify-spec' into 'master' Rémy Coutable2017-03-141-111/+120
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix intermittent spec failures in notify_spec.rb See merge request !9935
| * | | | | Fix intermittent spec failures in notify_spec.rbNick Thomas2017-03-141-111/+120
| | | | | |
* | | | | | Merge branch '29441-cancel-button-misaligned-in-new-application-page' into ↵Filipa Lacerda2017-03-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Cancel button misaligned in New Application page" Closes #29441 See merge request !9933
| * | | | | | Change Canccel button class29441-cancel-button-misaligned-in-new-application-pageChris Peressini2017-03-141-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Used to be `btn-default`, change it to `btn-cancel`
* | | | | | Merge branch 'remove-satellites' into 'master' Douwe Maan2017-03-141-10/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused satellites config See merge request !9919
| * | | | | | Remove unused satellites configStan Hu2017-03-131-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the old migrations depend on 1_settings.rb, so we can't quite remove those completely.
* | | | | | | Merge branch 'syshook_documentation_updated' into 'master' Achilleas Pipinellis2017-03-141-2/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syshook documentation updated See merge request !9893
| * | | | | | | Syshook documentation updatedgpongelli2017-03-141-2/+13
|/ / / / / / /
* | | | | | | Merge branch 'issue-boards-new-search-bar' into 'master' Filipa Lacerda2017-03-1420-195/+214
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added filtered search bar to issue boards Closes #28312 See merge request !9757
| * | | | | | | added eventhub to emit update tokens eventissue-boards-new-search-barPhil Hughes2017-03-143-3/+9
| | | | | | | |
| * | | | | | | Use reduce instead of a forEachPhil Hughes2017-03-095-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed an isArray check to use -1 Added comment to boards search manager to explain behaviour
| * | | | | | | Removed previous filter codePhil Hughes2017-03-083-28/+3
| | | | | | | |
| * | | | | | | Fixed up boards filter spec due to CSS classes changingPhil Hughes2017-03-082-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed issue with Vue resource encoding + in search term
| * | | | | | | Hides on mobilePhil Hughes2017-03-081-1/+2
| | | | | | | |
| * | | | | | | Fixed eslint errorsPhil Hughes2017-03-082-2/+1
| | | | | | | |
| * | | | | | | Updated specsPhil Hughes2017-03-089-123/+86
| | | | | | | |
| * | | | | | | Handle clear search asyncPhil Hughes2017-03-081-0/+5
| | | | | | | |
| * | | | | | | Make changing the URL optional - future proof ourselves for the modal windowPhil Hughes2017-03-082-5/+9
| | | | | | | |
| * | | | | | | Stop droplab from destroying itself is handled asyncPhil Hughes2017-03-082-3/+10
| | | | | | | |
| * | | | | | | Updates the URLPhil Hughes2017-03-082-1/+2
| | | | | | | |
| * | | | | | | Changed storePhil Hughes2017-03-086-20/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Async updates the boards when searching
| * | | | | | | Added filtered search bar to issue boardsPhil Hughes2017-03-088-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28312
* | | | | | | | Merge branch 'google-protobuf-3.2.0.1' into 'master' Rémy Coutable2017-03-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use google-protobuf 3.2.0.1 Closes #29084 See merge request !9932
| * | | | | | | | Use google-protobuf 3.2.0.1Jacob Vosmaer2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sub-patch release extends support in pre-compiled libraries down to glibc 2.12. https://github.com/google/protobuf/issues/2783 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/29084
* | | | | | | | | Merge branch 'docs/include-gitlab-defaul-example-in-updates' into 'master' DJ Mountney2017-03-142-3/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include instructions to update /etc/default/gitlab See merge request !9925
| * | | | | | | | | Include instructions to update /etc/default/gitlabdocs/include-gitlab-defaul-example-in-updatesAchilleas Pipinellis2017-03-142-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were missing some info on updating /etc/default/gitlab In particular, changes needed to be made in order for Pages to work, see https://gitlab.com/gitlab-org/gitlab-ce/issues/29372
* | | | | | | | | | Merge branch 'fix_relative_position_calculation' into 'master' Douwe Maan2017-03-144-36/+192
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative position calculation Closes #29269 See merge request !9837
| * | | | | | | | | [Issue sorting]Addressed review commentsfix_relative_position_calculationValery Sizov2017-03-143-25/+119
| | | | | | | | | |
| * | | | | | | | | [Issue Sorting] Improve migrationValery Sizov2017-03-142-5/+3
| | | | | | | | | |
| * | | | | | | | | [Issue sorting] Filling positions preferable in the middleValery Sizov2017-03-142-24/+39
| | | | | | | | | |
| * | | | | | | | | Added migration to reset existing relative_position for issuesValery Sizov2017-03-141-0/+18
| | | | | | | | | |
| * | | | | | | | | Fix relative position calculationValery Sizov2017-03-142-8/+39
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' Sean McGivern2017-03-146-11/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use the v4 API from the frontend" Closes #28864 See merge request !9714
| * | | | | | | | | Update API on frontend to use v428864-use-the-v4-api-from-the-frontendSam Rose2017-03-146-11/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Use options object to pass params for project endpoint
* | | | | | | | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' Kamil Trzciński2017-03-143-14/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store capybara screenshots as build artifacts Closes #13971 See merge request !7985