summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only ensure against yield so that pool should be availablecreate-connection-poolLin Jen-Shin2017-02-141-4/+5
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9192#note_23293693
* Have some simple way to create connection poolLin Jen-Shin2017-02-142-0/+72
|
* Merge branch 'dynamic-header-fixture' into 'master' Clement Ho2017-02-133-36/+5
|\ | | | | | | | | Replace static fixture for header_spec.js See merge request !9174
| * Replace static fixture for header_spec.js (!9174)winniehell2017-02-133-36/+5
| |
* | Merge branch 'new-branch-fixture' into 'master' Clement Ho2017-02-134-6/+34
|\ \ | | | | | | | | | | | | Replace static fixture for new_branch_spec.js See merge request !9131
| * | Replace static fixture for new_branch_spec.js (!9131)winniehell2017-02-114-6/+34
| | |
* | | Merge branch '28032-tooltips-file-name' into 'master' Annabel Dunstone Gray2017-02-132-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds container to tooltip in order to make it work with overflow:hidden in parent element Closes #28032 See merge request !9170
| * | | Adds container to tooltip in order to make it work with overflow:hidden in ↵28032-tooltips-file-nameFilipa Lacerda2017-02-122-3/+8
| | | | | | | | | | | | | | | | parent element
* | | | Merge branch '28034-icon-in-issue-search-dropdown-still-animates' into 'master'Annabel Dunstone Gray2017-02-132-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Icon in issue search dropdown still animates" Closes #28034 See merge request !9156
| * | | | Disable animation on avatars inside filter dropdowns28034-icon-in-issue-search-dropdown-still-animatesAlfredo Sumaran2017-02-101-0/+2
| | | | |
| * | | | Remove animation for icons on filter dropdownAlfredo Sumaran2017-02-101-2/+1
| |/ / /
* | | | Merge branch ↵Annabel Dunstone Gray2017-02-132-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget' into 'master' Resolve "Missing margin between loading icon and text in Merge Request Widget" Closes #27947 See merge request !9119
| * | | | Add margin to loading icon in Merge Request Widget27947-missing-margin-between-loading-icon-and-text-in-merge-request-widgetSam Rose2017-02-102-2/+10
| |/ / /
* | | | Merge branch 'fix/cycle-analytics-events-limit' into 'master' Sean McGivern2017-02-135-2/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add limit to the number of events showed in cycle analytics See merge request !7743
| * | | | Fix display logic for warning messagefix/cycle-analytics-events-limitSam Rose2017-02-082-4/+4
| | | | |
| * | | | Revise tooltip message and warning textSam Rose2017-02-071-4/+5
| | | | |
| * | | | Display number of shown events on Plan stage of Cycle AnalyticsSam Rose2017-02-072-1/+10
| | | | |
| * | | | fix specJames Lopez2017-02-071-4/+5
| | | | |
| * | | | add specJames Lopez2017-02-062-35/+44
| | | | |
| * | | | move query limit to base event fetcherJames Lopez2017-02-061-1/+3
| | | | |
| * | | | user project and not empty_project as we need the repo stuffJames Lopez2017-02-061-1/+1
| | | | |
| * | | | fix typo [ci skip]James Lopez2017-02-061-2/+2
| | | | |
| * | | | undo local changelog changeJames Lopez2017-02-061-2/+0
| | | | |
| * | | | Add limit to the number of events showed in cycle analytics and specJames Lopez2017-02-063-0/+41
| | | | |
* | | | | Merge branch '27886_rebasing_fix' into 'master'Sean McGivern2017-02-132-10/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark as WIP based on MR commits only Closes #27886 See merge request !9085
| * | | | | Mark as WIP based on MR commits onlyJarka Kadlecova2017-02-132-10/+37
| | | | | |
* | | | | | Merge branch 'make-rubocop-happy-again' into 'master'Rémy Coutable2017-02-132-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use safe navigation operator to make rubocop happy See merge request !9185
| * | | | | | Use safe navigation operator to make rubocop happywinniehell2017-02-132-2/+2
| | | | | | |
* | | | | | | Merge branch '24976-start-of-line-mention' into 'master' Sean McGivern2017-02-1314-24/+411
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature to create directly addressed Todos when mentioned in beginning Closes #24976 See merge request !7926
| * | | | | | | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-0814-24/+411
| | | | | | | |
* | | | | | | | Merge branch 'issue-boards-docs-update' into 'master' Achilleas Pipinellis2017-02-136-24/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated issue boards docs Closes #27872 See merge request !9097
| * | | | | | | | Update issue boards docsAchilleas Pipinellis2017-02-133-21/+20
| | | | | | | | |
| * | | | | | | | Updated copyissue-boards-docs-updatePhil Hughes2017-02-101-6/+6
| | | | | | | | |
| * | | | | | | | Added missing filter wordPhil Hughes2017-02-091-2/+2
| | | | | | | | |
| * | | | | | | | Documented removing issuePhil Hughes2017-02-092-0/+8
| | | | | | | | |
| * | | | | | | | Updated issue boards docsPhil Hughes2017-02-094-17/+13
| | | | | | | | |
* | | | | | | | | Merge branch '20732_member_exists_409' into 'master'Sean McGivern2017-02-137-12/+487
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add member: Always return 409 when a member exists Closes #20732 See merge request !9093
| * | | | | | | | Add member: Always return 409 when a member existsJarka Kadlecova2017-02-107-12/+487
| | | | | | | | |
* | | | | | | | | Merge branch '27608-fixes-markdown-in-activity-feed-is-light-gray' into ↵Filipa Lacerda2017-02-132-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' removes grayish blue color for events activity Closes #27608 See merge request !9179
| * | | | | | | | | Fixes markdown in activity feed is light gray27608-fixes-markdown-in-activity-feed-is-light-grayNur Rony2017-02-132-1/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-1317-36/+199
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gather issuable metadata to avoid n+ queries on index view Closes #25900 See merge request !9006
| * | | | | | | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-0917-36/+199
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-1320-47/+35
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Rubocop to Ruby 2.3 See merge request !8994
| * | | | | | | | | | | Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-0720-47/+35
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs/merge_requests_index' into 'master' Achilleas Pipinellis2017-02-134-180/+178
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move merge requests index file inside the merge_requests dir See merge request !9181
| * | | | | | | | | | | | Move merge requests index file inside the merge_requests dirAchilleas Pipinellis2017-02-134-180/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'fix_issue_from_milestone' into 'master'Rémy Coutable2017-02-135-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue from milestone See merge request !8895
| * | | | | | | | | | | | | fix issue creation from milestone doesn't assign the milestonewendy04022017-02-125-3/+25
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'concurrent-foreign-keys' into 'master'Rémy Coutable2017-02-138-10/+183
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method for creating foreign keys concurrently See merge request !9069
| * | | | | | | | | | | | Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keysYorick Peterse2017-02-106-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a Rubocop rule to enforce the use of add_concurrent_foreign_key instead of the regular add_foreign_key method. This cop has been disabled for existing migrations so we don't need to change those.