summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed pipeline action tooltips being cut offpipeline-tooltips-overflowPhil Hughes2017-03-152-0/+8
| | | | | | | | | | Changed the container for the tooltip to be the body so that the tooltip does not get cut off with the overflow area. This change affects both merge request pipelines table & the pipelines page Closes #29314
* Merge branch 'test-db-rollback' into 'master' Kamil Trzciński2017-03-1511-9/+28
|\ | | | | | | | | | | | | Add a test which would rollback db and migrate again Closes #29106 See merge request !9908
| * Split to two commands, feedback:test-db-rollbackLin Jen-Shin2017-03-141-1/+2
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9908#note_25331127
| * Use `remove_foreign_key :timelogs, name: '...'`Lin Jen-Shin2017-03-141-9/+2
| | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9908#note_25324225
| * Drop the index only for postgresql, becauseLin Jen-Shin2017-03-141-1/+2
| | | | | | | | | | | | mysql cannot simply drop the index without dropping the corresponding foreign key, and we certainly don't want to drop the foreign key here.
| * Disable rubocop for down methodLin Jen-Shin2017-03-141-0/+1
| |
| * Fix for postgresqlLin Jen-Shin2017-03-144-4/+12
| |
| * Add a test which would rollback db and migrate againLin Jen-Shin2017-03-149-7/+26
| | | | | | | | Closes #29106
* | Merge branch ↵Rémy Coutable2017-03-153-3/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '29469-message-for-project-x-will-be-deleted-should-include-namespace' into 'master' Display full project name with namespace upon deletion Closes #29469 See merge request !9955
| * | Display full project name with namespace upon deletionMark Fletcher2017-03-153-3/+7
| | | | | | | | | | | | * Removes ambiguity when two projects exist with the same name
* | | 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