Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Expect @issuable_meta_data to be set, feedback:fix-project-without-repo-and-wiki | Lin Jen-Shin | 2017-03-16 | 1 | -0/+1 |
| | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9956#note_25445832 | ||||
* | Fix projects without repo and wiki | Lin Jen-Shin | 2017-03-15 | 2 | -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 Hu | 2017-03-15 | 2 | -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-rollback | DJ Mountney | 2017-03-14 | 2 | -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 Sumaran | 2017-03-15 | 1 | -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-0 | Eric Eastwood | 2017-03-14 | 1 | -1/+6 |
| | | | | | | | | Fix #29414 | ||||
* | | Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' | Alfredo Sumaran | 2017-03-15 | 7 | -6/+122 |
|\ \ | | | | | | | | | | | | | | | | | | | Toggle long Project names Closes #28187 See merge request !9501 | ||||
| * | | Toggle project name if too long28187-project-name-cut-off-with-nested-groups | Sam Rose | 2017-03-13 | 7 | -6/+122 |
| | | | |||||
* | | | Merge branch 'preserve_order_issue_board' into 'master' | Douwe Maan | 2017-03-14 | 4 | -1/+49 |
|\ \ \ | | | | | | | | | | | | | | | | | Preserve order by priority on issues board See merge request !9939 | ||||
| * | | | Preserve order by priority on issues boardpreserve_order_issue_board | Valery Sizov | 2017-03-14 | 4 | -1/+49 |
| | | | | |||||
* | | | | Merge branch 'sh-expand-on-definition-of-done' into 'master' | Stan Hu | 2017-03-14 | 2 | -0/+49 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add performance/scalability concerns to CONTRIBUTING.md See merge request !8677 | ||||
| * | | | | Describe polling with ETag cachingsh-expand-on-definition-of-done | Adam Niedzielski | 2017-03-14 | 2 | -2/+44 |
| | | | | | |||||
| * | | | | Add performance/scalability concerns to CONTRIBUTING.md | Stan Hu | 2017-03-13 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge branch '29425-fix-activity-stream-first-line-markdown' into 'master' | Robert Speicher | 2017-03-14 | 3 | -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-markdown | Eric Eastwood | 2017-03-14 | 3 | -5/+21 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29425 | ||||
* | | | | | Merge branch 'fix-intermittent-notify-spec' into 'master' | Rémy Coutable | 2017-03-14 | 1 | -111/+120 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix intermittent spec failures in notify_spec.rb See merge request !9935 | ||||
| * | | | | | Fix intermittent spec failures in notify_spec.rb | Nick Thomas | 2017-03-14 | 1 | -111/+120 |
| | | | | | | |||||
* | | | | | | Merge branch '29441-cancel-button-misaligned-in-new-application-page' into ↵ | Filipa Lacerda | 2017-03-14 | 1 | -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-page | Chris Peressini | 2017-03-14 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Used to be `btn-default`, change it to `btn-cancel` | ||||
* | | | | | | Merge branch 'remove-satellites' into 'master' | Douwe Maan | 2017-03-14 | 1 | -10/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused satellites config See merge request !9919 | ||||
| * | | | | | | Remove unused satellites config | Stan Hu | 2017-03-13 | 1 | -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 Pipinellis | 2017-03-14 | 1 | -2/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syshook documentation updated See merge request !9893 | ||||
| * | | | | | | | Syshook documentation updated | gpongelli | 2017-03-14 | 1 | -2/+13 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'issue-boards-new-search-bar' into 'master' | Filipa Lacerda | 2017-03-14 | 20 | -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-bar | Phil Hughes | 2017-03-14 | 3 | -3/+9 |
| | | | | | | | | |||||
| * | | | | | | | Use reduce instead of a forEach | Phil Hughes | 2017-03-09 | 5 | -11/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed an isArray check to use -1 Added comment to boards search manager to explain behaviour | ||||
| * | | | | | | | Removed previous filter code | Phil Hughes | 2017-03-08 | 3 | -28/+3 |
| | | | | | | | | |||||
| * | | | | | | | Fixed up boards filter spec due to CSS classes changing | Phil Hughes | 2017-03-08 | 2 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed issue with Vue resource encoding + in search term | ||||
| * | | | | | | | Hides on mobile | Phil Hughes | 2017-03-08 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fixed eslint errors | Phil Hughes | 2017-03-08 | 2 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Updated specs | Phil Hughes | 2017-03-08 | 9 | -123/+86 |
| | | | | | | | | |||||
| * | | | | | | | Handle clear search async | Phil Hughes | 2017-03-08 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Make changing the URL optional - future proof ourselves for the modal window | Phil Hughes | 2017-03-08 | 2 | -5/+9 |
| | | | | | | | | |||||
| * | | | | | | | Stop droplab from destroying itself is handled async | Phil Hughes | 2017-03-08 | 2 | -3/+10 |
| | | | | | | | | |||||
| * | | | | | | | Updates the URL | Phil Hughes | 2017-03-08 | 2 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Changed store | Phil Hughes | 2017-03-08 | 6 | -20/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Async updates the boards when searching | ||||
| * | | | | | | | Added filtered search bar to issue boards | Phil Hughes | 2017-03-08 | 8 | -21/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28312 | ||||
* | | | | | | | | Merge branch 'google-protobuf-3.2.0.1' into 'master' | Rémy Coutable | 2017-03-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use google-protobuf 3.2.0.1 Closes #29084 See merge request !9932 | ||||
| * | | | | | | | | Use google-protobuf 3.2.0.1 | Jacob Vosmaer | 2017-03-14 | 1 | -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 Mountney | 2017-03-14 | 2 | -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-updates | Achilleas Pipinellis | 2017-03-14 | 2 | -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 Maan | 2017-03-14 | 4 | -36/+192 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative position calculation Closes #29269 See merge request !9837 | ||||
| * | | | | | | | | | [Issue sorting]Addressed review commentsfix_relative_position_calculation | Valery Sizov | 2017-03-14 | 3 | -25/+119 |
| | | | | | | | | | | |||||
| * | | | | | | | | | [Issue Sorting] Improve migration | Valery Sizov | 2017-03-14 | 2 | -5/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | [Issue sorting] Filling positions preferable in the middle | Valery Sizov | 2017-03-14 | 2 | -24/+39 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added migration to reset existing relative_position for issues | Valery Sizov | 2017-03-14 | 1 | -0/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix relative position calculation | Valery Sizov | 2017-03-14 | 2 | -8/+39 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' | Sean McGivern | 2017-03-14 | 6 | -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-frontend | Sam Rose | 2017-03-14 | 6 | -11/+11 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use options object to pass params for project endpoint | ||||
* | | | | | | | | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' | Kamil Trzciński | 2017-03-14 | 3 | -14/+12 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store capybara screenshots as build artifacts Closes #13971 See merge request !7985 |